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

25 lines
1.2 KiB
Diff
Raw Normal View History

Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
From 61b790005fc01a2e5519c426d6ff0ac80e672f2b Mon Sep 17 00:00:00 2001
More 1.14 work
2019-04-27 06:26:04 +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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
index 40c9cba760..3004270455 100644
More 1.14 work
2019-04-27 06:26:04 +00:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
@@ -998,6 +998,7 @@ public class WorldServer extends World {
More 1.14 work
2019-04-27 06:26:04 +00:00
// CraftBukkit start
private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
Updated Upstream (Bukkit/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 Bukkit Changes: c987938a SPIGOT-5180: Add Villager#sleep() and #wakeup() methods CraftBukkit Changes: 7f33c6a2 SPIGOT-5196: Restore previous version behaviour regarding cancelled BlockBreakEvent 6a5fc902 Improve diff in EntityHanging c98d61bf SPIGOT-4712: Allow spawning of upwards or downwards facing item frames db971477 SPIGOT-5199: Fix NPE if setting the book of the ItemMeta of a lectern b0ef3996 SPIGOT-4679 Fix black lines after book paragraphs 1215188f SPIGOT-5180: Add Villager#sleep() and #wakeup() methods c03b2bef SPIGOT-4975: NPE on WorldGenStronghold When Using Multiple Worlds 65ea162c Ensure Bukkit data pack is always up to date 0b107b8d MC-157395, SPIGOT-5193: Small armor stands do not drop loot 6da0abca SPIGOT-5195: Player loot table does not drop when keepInventory is on 8b09d983 SPIGOT-5190: Superfluous EntityCombustEvent called when using fire aspect sword Spigot Changes: 1981d553 SPIGOT-5198: Catch more bad async operations 6a14ca46 Rebuild patches
2019-07-23 19:17:32 +00:00
org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
More 1.14 work
2019-04-27 06:26:04 +00:00
+ if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
if (entity.dead) {
// WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
return false;
--
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
2.25.2
More 1.14 work
2019-04-27 06:26:04 +00:00