core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0125-Fix-Double-World-Add-i...

38 lines
2.0 KiB
Diff
Raw Normal View History

Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
From 009ed21b65fa5fd70773813da89fde40d26e22ff Mon Sep 17 00:00:00 2001
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
From: Aikar <aikar@aikar.co>
Date: Tue, 21 Jun 2016 22:54:34 -0400
Subject: [PATCH] Fix Double World Add issues
Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
Updated Upstream (CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 7033f180 Hoist out synchronisation from ChunkRegionLoader Spigot Changes: 500ff5d4 Rebuild patches Additional Paper changes: Fixed Versioned World Folders to not synchronize on ChunkRegionLoader Optimized Save Queue even more to use a Long2ObjectOpenHashmap for save map Add World#getXIfLoaded to IWorldReader to expose it to more places
2018-09-11 02:38:42 +00:00
index e831ea1429..d40d9d1173 100644
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
Updated Upstream (CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 7033f180 Hoist out synchronisation from ChunkRegionLoader Spigot Changes: 500ff5d4 Rebuild patches Additional Paper changes: Fixed Versioned World Folders to not synchronize on ChunkRegionLoader Optimized Save Queue even more to use a Long2ObjectOpenHashmap for save map Add World#getXIfLoaded to IWorldReader to expose it to more places
2018-09-11 02:38:42 +00:00
@@ -1048,7 +1048,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
}
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
public static void a(Entity entity, GeneratorAccess generatoraccess, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
- if (generatoraccess.addEntity(entity, reason) && entity.isVehicle()) {
+ if (!entity.valid && generatoraccess.addEntity(entity, reason) && entity.isVehicle()) { // Paper
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
// CraftBukkit end
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
Iterator iterator = entity.bP().iterator();
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
index d31101861c..a81c7dfa2e 100644
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
@@ -993,6 +993,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
if (entity == null) return false;
+ if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
Update upstream
2017-12-09 17:37:09 +00:00
org.bukkit.event.Cancellable event = null;
if (entity instanceof EntityLiving && !(entity instanceof EntityPlayer)) {
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00
--
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
2.19.0
Fix Double World Add issues - Fixes #328 Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state
2016-06-23 02:50:19 +00:00