diff --git a/PATCHES.md b/PATCHES.md index 24cd4774..2711f46e 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -10,17 +10,17 @@ # Patches | ----- | ------------- |:-------------:| -----:| | server | Add 5 second tps average in /tps | William Blake Galbreath | | | api | Add ChatColor.getById | Aikar | | -| api | Add GameProfileLookupEvent | tr7zw | | | server | Add GameProfileLookupEvent | tr7zw | | +| api | Add GameProfileLookupEvent | tr7zw | | | server | Add GlueList | Mykyta Komarn | | | server | Add IntelliJ IDEA runnable | Bud Gidiere | | | server | Add JsonList save timings | Ivan Pekov | | -| api | Add NBT API as a first-class lib | tr7zw | | | server | Add NBT API as a first-class lib | tr7zw | | -| api | Add StructureLocateEvent | dfsek | | +| api | Add NBT API as a first-class lib | tr7zw | | | server | Add StructureLocateEvent | dfsek | | -| api | Add last tick time API | Ivan Pekov | tr7zw | +| api | Add StructureLocateEvent | dfsek | | | server | Add last tick time API | Ivan Pekov | tr7zw | +| api | Add last tick time API | Ivan Pekov | tr7zw | | server | Add no-tick block list | William Blake Galbreath | | | server | Add nspt command | Ivan Pekov | | | server | Add option to disable dolphin treasure searching | William Blake Galbreath | | @@ -35,7 +35,6 @@ # Patches | server | Allow soil to moisten from water directly under it | William Blake Galbreath | | | server | Allow to change the piston push limit | tr7zw | | | server | Alternative Keepalive Handling | William Blake Galbreath | | -| server | Async entity tracking | Mykyta Komarn | Ivan Pekov | | server | Avoid double I/O operation on load player file | ㄗㄠˋ ㄑㄧˊ | | | server | Barrels and enderchests 6 rows | William Blake Galbreath | | | server | Brandings | tr7zw | | @@ -60,7 +59,6 @@ # Patches | server | Fix lead fall dmg config | tr7zw | | | server | Fix merging spawning values | Mariell Hoversholm | | | server | Fix the dead lagging the server | William Blake Galbreath | | -| server | Fix villager dupe | Ivan Pekov | | | server | Global Eula file | tr7zw | | | server | Heavily optimize furnance fuel and recipe lookups | tr7zw | Mykyta Komarn | | server | Heavily optimize recipe lookups in CraftingManager | Mykyta Komarn | Ivan Pekov | @@ -70,11 +68,10 @@ # Patches | server | Item stuck sleep config | tr7zw | | | api | Kill AnnotationTest | tr7zw | | | server | Lagging threshold | William Blake Galbreath | | -| server | Load also the chunk that you're teleporting to | Ivan Pekov | | | server | MC-168772 Fix - Add turtle egg block options | William Blake Galbreath | | | server | MC-4 Fix - Item position desync | William Blake Galbreath | | -| api | Modify POM | tr7zw | | | server | Modify POM | tr7zw | | +| api | Modify POM | tr7zw | | | server | Modify default configs | tr7zw | | | server | Nuke streams off BlockPosition | Ivan Pekov | | | server | Nuke streams off SectionPosition | Ivan Pekov | | @@ -91,10 +88,10 @@ # Patches | server | PaperPR - Add hex color code support for console logging | William Blake Galbreath | | | server | Per entity (type) collision settings | MrIvanPlays | tr7zw | | server | Persistent TileEntity Lore and DisplayName | jmp | | -| api | PlayerAttackEntityEvent | Ivan Pekov | | | server | PlayerAttackEntityEvent | Ivan Pekov | | -| api | ProxyForwardDataEvent | Ivan Pekov | | +| api | PlayerAttackEntityEvent | Ivan Pekov | | | server | ProxyForwardDataEvent | Ivan Pekov | | +| api | ProxyForwardDataEvent | Ivan Pekov | | | server | Purpur config files | William Blake Galbreath | | | server | Redirect Configs | tr7zw | | | server | Remove some streams and object allocations | Phoenix616 | | diff --git a/patches/server/0037-Load-also-the-chunk-that-you-re-teleporting-to.patch b/patches/removed/server/0037-Load-also-the-chunk-that-you-re-teleporting-to.patch similarity index 100% rename from patches/server/0037-Load-also-the-chunk-that-you-re-teleporting-to.patch rename to patches/removed/server/0037-Load-also-the-chunk-that-you-re-teleporting-to.patch diff --git a/patches/server/0048-Fix-villager-dupe.patch b/patches/removed/server/0048-Fix-villager-dupe.patch similarity index 100% rename from patches/server/0048-Fix-villager-dupe.patch rename to patches/removed/server/0048-Fix-villager-dupe.patch diff --git a/patches/server/0064-Async-entity-tracking.patch b/patches/removed/server/0064-Async-entity-tracking.patch similarity index 100% rename from patches/server/0064-Async-entity-tracking.patch rename to patches/removed/server/0064-Async-entity-tracking.patch diff --git a/patches/server/0038-Highly-optimize-VillagePlace-filtering.patch b/patches/server/0037-Highly-optimize-VillagePlace-filtering.patch similarity index 100% rename from patches/server/0038-Highly-optimize-VillagePlace-filtering.patch rename to patches/server/0037-Highly-optimize-VillagePlace-filtering.patch diff --git a/patches/server/0039-Nuke-streams-off-BlockPosition.patch b/patches/server/0038-Nuke-streams-off-BlockPosition.patch similarity index 100% rename from patches/server/0039-Nuke-streams-off-BlockPosition.patch rename to patches/server/0038-Nuke-streams-off-BlockPosition.patch diff --git a/patches/server/0040-Nuke-streams-off-SectionPosition.patch b/patches/server/0039-Nuke-streams-off-SectionPosition.patch similarity index 100% rename from patches/server/0040-Nuke-streams-off-SectionPosition.patch rename to patches/server/0039-Nuke-streams-off-SectionPosition.patch diff --git a/patches/server/0041-Stop-wasting-resources-on-JsonList-get.patch b/patches/server/0040-Stop-wasting-resources-on-JsonList-get.patch similarity index 100% rename from patches/server/0041-Stop-wasting-resources-on-JsonList-get.patch rename to patches/server/0040-Stop-wasting-resources-on-JsonList-get.patch diff --git a/patches/server/0042-ProxyForwardDataEvent.patch b/patches/server/0041-ProxyForwardDataEvent.patch similarity index 100% rename from patches/server/0042-ProxyForwardDataEvent.patch rename to patches/server/0041-ProxyForwardDataEvent.patch diff --git a/patches/server/0043-Fix-Unable-to-save-chunk-error.patch b/patches/server/0042-Fix-Unable-to-save-chunk-error.patch similarity index 100% rename from patches/server/0043-Fix-Unable-to-save-chunk-error.patch rename to patches/server/0042-Fix-Unable-to-save-chunk-error.patch diff --git a/patches/server/0044-Fix-LightEngineThreaded-memory-leak.patch b/patches/server/0043-Fix-LightEngineThreaded-memory-leak.patch similarity index 89% rename from patches/server/0044-Fix-LightEngineThreaded-memory-leak.patch rename to patches/server/0043-Fix-LightEngineThreaded-memory-leak.patch index f08f3f5d..86dec0d6 100644 --- a/patches/server/0044-Fix-LightEngineThreaded-memory-leak.patch +++ b/patches/server/0043-Fix-LightEngineThreaded-memory-leak.patch @@ -18,10 +18,10 @@ index fd0beefb900c064d3c35a3d2f79f5b7d9c1287bb..4d024a4849b7566c0faba131caab57b4 return this.size == 0 && this.pendingTasks.isEmpty(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index fc8d97262f39db62e1ea2cdd1d9c1df092175c63..b3e24d6f44320bf9b13f627dc5a9cb46614afe9b 100644 +index 97db7999968bceb2f069eb449c64e7da874d787f..b739e19cb50e4f86f1cb100b88cf91fbbbf796b4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1773,6 +1773,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1772,6 +1772,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } // Paper end diff --git a/patches/server/0045-Respect-PlayerKickEvent-leaveMessage.patch b/patches/server/0044-Respect-PlayerKickEvent-leaveMessage.patch similarity index 100% rename from patches/server/0045-Respect-PlayerKickEvent-leaveMessage.patch rename to patches/server/0044-Respect-PlayerKickEvent-leaveMessage.patch diff --git a/patches/server/0046-Shutdown-Bootstrap-thread-pool.patch b/patches/server/0045-Shutdown-Bootstrap-thread-pool.patch similarity index 100% rename from patches/server/0046-Shutdown-Bootstrap-thread-pool.patch rename to patches/server/0045-Shutdown-Bootstrap-thread-pool.patch diff --git a/patches/server/0047-Optimize-Villagers.patch b/patches/server/0046-Optimize-Villagers.patch similarity index 100% rename from patches/server/0047-Optimize-Villagers.patch rename to patches/server/0046-Optimize-Villagers.patch diff --git a/patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch b/patches/server/0047-Optimize-whitelist-command-for-multiple-additions-re.patch similarity index 100% rename from patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch rename to patches/server/0047-Optimize-whitelist-command-for-multiple-additions-re.patch diff --git a/patches/server/0050-PlayerAttackEntityEvent.patch b/patches/server/0048-PlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0050-PlayerAttackEntityEvent.patch rename to patches/server/0048-PlayerAttackEntityEvent.patch diff --git a/patches/server/0051-Ensure-pools-create-daemon-threads.patch b/patches/server/0049-Ensure-pools-create-daemon-threads.patch similarity index 100% rename from patches/server/0051-Ensure-pools-create-daemon-threads.patch rename to patches/server/0049-Ensure-pools-create-daemon-threads.patch diff --git a/patches/server/0052-Add-StructureLocateEvent.patch b/patches/server/0050-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0052-Add-StructureLocateEvent.patch rename to patches/server/0050-Add-StructureLocateEvent.patch diff --git a/patches/server/0053-Add-IntelliJ-IDEA-runnable.patch b/patches/server/0051-Add-IntelliJ-IDEA-runnable.patch similarity index 100% rename from patches/server/0053-Add-IntelliJ-IDEA-runnable.patch rename to patches/server/0051-Add-IntelliJ-IDEA-runnable.patch diff --git a/patches/server/0054-Respect-rotation-when-respawning.patch b/patches/server/0052-Respect-rotation-when-respawning.patch similarity index 100% rename from patches/server/0054-Respect-rotation-when-respawning.patch rename to patches/server/0052-Respect-rotation-when-respawning.patch diff --git a/patches/server/0055-Fix-merging-spawning-values.patch b/patches/server/0053-Fix-merging-spawning-values.patch similarity index 100% rename from patches/server/0055-Fix-merging-spawning-values.patch rename to patches/server/0053-Fix-merging-spawning-values.patch diff --git a/patches/server/0056-Use-Glue-List-in-WeightedList.patch b/patches/server/0054-Use-Glue-List-in-WeightedList.patch similarity index 100% rename from patches/server/0056-Use-Glue-List-in-WeightedList.patch rename to patches/server/0054-Use-Glue-List-in-WeightedList.patch diff --git a/patches/server/0057-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch b/patches/server/0055-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch similarity index 100% rename from patches/server/0057-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch rename to patches/server/0055-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch diff --git a/patches/server/0058-Use-faster-block-collision-check-for-entity-suffocat.patch b/patches/server/0056-Use-faster-block-collision-check-for-entity-suffocat.patch similarity index 100% rename from patches/server/0058-Use-faster-block-collision-check-for-entity-suffocat.patch rename to patches/server/0056-Use-faster-block-collision-check-for-entity-suffocat.patch diff --git a/patches/server/0059-Add-nspt-command.patch b/patches/server/0057-Add-nspt-command.patch similarity index 100% rename from patches/server/0059-Add-nspt-command.patch rename to patches/server/0057-Add-nspt-command.patch diff --git a/patches/server/0060-Configurable-flight-checks.patch b/patches/server/0058-Configurable-flight-checks.patch similarity index 100% rename from patches/server/0060-Configurable-flight-checks.patch rename to patches/server/0058-Configurable-flight-checks.patch diff --git a/patches/server/0061-Use-Glue-List-as-delegate-for-NonNullList.patch b/patches/server/0059-Use-Glue-List-as-delegate-for-NonNullList.patch similarity index 100% rename from patches/server/0061-Use-Glue-List-as-delegate-for-NonNullList.patch rename to patches/server/0059-Use-Glue-List-as-delegate-for-NonNullList.patch diff --git a/patches/server/0062-Heavily-optimize-recipe-lookups-in-CraftingManager.patch b/patches/server/0060-Heavily-optimize-recipe-lookups-in-CraftingManager.patch similarity index 100% rename from patches/server/0062-Heavily-optimize-recipe-lookups-in-CraftingManager.patch rename to patches/server/0060-Heavily-optimize-recipe-lookups-in-CraftingManager.patch diff --git a/patches/server/0063-Improve-task-performance.patch b/patches/server/0061-Improve-task-performance.patch similarity index 100% rename from patches/server/0063-Improve-task-performance.patch rename to patches/server/0061-Improve-task-performance.patch diff --git a/patches/server/0065-Optimize-advancement-loading.patch b/patches/server/0062-Optimize-advancement-loading.patch similarity index 100% rename from patches/server/0065-Optimize-advancement-loading.patch rename to patches/server/0062-Optimize-advancement-loading.patch diff --git a/patches/server/0066-Replace-some-hot-streams.patch b/patches/server/0063-Replace-some-hot-streams.patch similarity index 95% rename from patches/server/0066-Replace-some-hot-streams.patch rename to patches/server/0063-Replace-some-hot-streams.patch index 9a03770f..24b04d5f 100644 --- a/patches/server/0066-Replace-some-hot-streams.patch +++ b/patches/server/0063-Replace-some-hot-streams.patch @@ -125,10 +125,10 @@ index a60bb54270b98bad9cc8caa9ce2538f54b03fbfe..3b9ba7c012586c7620e69cf450b8d1c1 private void fa() { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d3d1120395ee0e5be781febefa502c40ad9dacdd..d61f493f515625772ab338cbad0292513493f132 100644 +index b43b02c0bdd5dbf0b7d30de90bdc2f74c015ecc8..b113d60408bcb77762587109ede7dc855d983254 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -769,11 +769,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -761,11 +761,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting { private void eV() { AxisAlignedBB axisalignedbb = (new AxisAlignedBB(this.getChunkCoordinates())).grow(32.0D, 10.0D, 32.0D); @@ -150,10 +150,10 @@ index d3d1120395ee0e5be781febefa502c40ad9dacdd..d61f493f515625772ab338cbad029251 @Override diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 4c7e1f5c2a332f5b5ed15b0528ed717f5f84f63f..2a6735ce6a3ac233e5b2e75538c182e613c9896e 100644 +index 939ef3bd6439a68dba4224661d050c6af0164178..ab3348a89b6864184d432e4a73fe02ac195b8629 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -679,11 +679,20 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation +@@ -678,11 +678,20 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation if (optional.isPresent()) { WorldServer worldserver = (WorldServer) this.world; @@ -280,7 +280,7 @@ index 89464cc770b4875ad65c5e84315e462689cea57b..ed13f8fe725ce7601e5c506b590042ce // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa0e7a0cda 100644 +index b739e19cb50e4f86f1cb100b88cf91fbbbf796b4..e41f0ae32f66e5bf3b5ca1e10be2293f945bb5b1 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -60,11 +60,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -297,7 +297,7 @@ index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa public void doIfNotEntityTicking(java.lang.Runnable run) { if (tickingEntities) { afterEntityTickingTasks.add(run); -@@ -829,6 +829,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -828,6 +828,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } // */ // Yatopia start @@ -305,7 +305,7 @@ index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa for (EntityPlayer player : players) { if (player.world == this) { player.tickWeather(); -@@ -836,6 +837,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -835,6 +836,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { player.updateWeather(this.lastRainLevel, this.rainLevel, this.lastThunderLevel, this.thunderLevel); // Yatopia end } @@ -317,7 +317,7 @@ index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa } /* // Yatopia start - moved up -@@ -855,9 +861,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -854,9 +860,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { // CraftBukkit end */ // Yatopia end @@ -328,7 +328,7 @@ index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa // CraftBukkit start long l = this.worldData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime()); -@@ -1027,9 +1031,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1026,9 +1030,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { } private void wakeupPlayers() { @@ -340,7 +340,7 @@ index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa } // Paper start - optimise random block ticking -@@ -1795,8 +1799,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1794,8 +1798,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { // Spigot start if ( entity instanceof EntityHuman ) { @@ -351,7 +351,7 @@ index b3e24d6f44320bf9b13f627dc5a9cb46614afe9b..304769013a68ec18cb87916b0363edfa for (Object o : worldData.data.values() ) { if ( o instanceof WorldMap ) -@@ -1813,7 +1818,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { +@@ -1812,7 +1817,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { } } } diff --git a/patches/server/0067-Use-GlueList-for-some-list-initialisations-in-packet.patch b/patches/server/0064-Use-GlueList-for-some-list-initialisations-in-packet.patch similarity index 100% rename from patches/server/0067-Use-GlueList-for-some-list-initialisations-in-packet.patch rename to patches/server/0064-Use-GlueList-for-some-list-initialisations-in-packet.patch