Merge pull request #59 from tr7zw/dev/upstream

Dev/upstream
2024-07-07 20:14:54 +02:00 · 2020-08-07 09:47:51 -05:00 · 2020-08-07 09:47:51 -05:00 · e91f44d0a8
commit e91f44d0a8
parent 81ec5adcb5 aeab0d5f19
9 changed files with 20 additions and 22 deletions
--- a/PATCHES.md
+++ b/PATCHES.md
@ -11,11 +11,11 @@ # Patches
 | server |  Add 5 second tps average in /tps      | William Blake Galbreath |  |
 | api |  Add ChatColor.getById      | Aikar |  |
 | api |  Add GameProfileLookupEvent      | tr7zw |  |
-| server |  Add GameProfileLookupEvent      | Bud Gidiere |  |
+| server |  Add GameProfileLookupEvent      | tr7zw |  |
 | api |  Add NBT API as a first class lib      | tr7zw |  |
 | server |  Add NBT-API as first-class lib      | tr7zw |  |
 | server |  Add Rainforest config      | Mariell Hoversholm |  |
-| server |  Add config Yatopia command and basic settings      | Bud Gidiere |  |
+| server |  Add config Yatopia command and basic settings      | tr7zw |  |
 | api |  Add getLastTickMs api      | tr7zw |  |
 | server |  Add getLastTickMs api      | tr7zw |  |
 | server |  Add option for only players to have collisions with      | tr7zw |  |
@ -24,10 +24,10 @@ # Patches
 | api |  Add server configuration      | ㄗㄠˋ ㄑㄧˊ |  |
 | server |  Akarin Updated Save json list async      | tsao chi |  |
 | server |  Akarin configuration      | ㄗㄠˋ ㄑㄧˊ |  |
+| server |  Akarin updated Async Path Finding      | tsao chi | Bud Gidiere |
 | server |  Allow to change the piston push limit      | tr7zw |  |
 | server |  Alternative Keepalive Handling      | William Blake Galbreath |  |
 | server |  Apply advancements async      | Mariell Hoversholm |  |
-| server |  Async navigation      | &quot;tsao-chi@the-lingo.org&quot; |  |
 | server |  Avoid double I/O operation on load player file      | ㄗㄠˋ ㄑㄧˊ |  |
 | server |  Brandings      | tr7zw |  |
 | server |  Configurable TPS Catchup      | William Blake Galbreath |  |
@ -39,7 +39,6 @@ # Patches
 | server |  Don&#39;t wake up entities when damage event is cancelled      | Phoenix616 |  |
 | server |  Dont send useless entity packets      | William Blake Galbreath |  |
 | server |  Fix &#39;outdated server&#39; showing in ping before server fully      | William Blake Galbreath |  |
-| api |  Fix PlayerInteractEvent for Armor Stands      | Aikar |  |
 | server |  Fix lead fall dmg config      | tr7zw |  |
 | server |  Fix the dead lagging the server      | William Blake Galbreath |  |
 | server |  Global Eula file      | tr7zw |  |
@ -53,15 +52,14 @@ # Patches
 | server |  Modify POM      | tr7zw |  |
 | server |  Modify default configs      | tr7zw |  |
 | server |  Optimize Hopper logic      | tr7zw |  |
-| server |  Optimize Pathfinder - Remove Streams / Optimized collections      | Aikar |  |
-| server |  Optimize TileEntity loading      | Bud Gidiere |  |
+| server |  Optimize TileEntity loading      | tr7zw |  |
 | server |  Optimize inventory API item handling      | Phoenix616 |  |
 | server |  Optimize redstone algorithm      | theosib | egg82 |
 | server |  Option for simpler Villagers      | tr7zw |  |
 | server |  Origami Server Config      | Phoenix616 |  |
 | server |  Player-saving-async-FileIO      | tr7zw |  |
 | server |  Purpur config files      | William Blake Galbreath |  |
-| server |  Redirect Configs      | Bud Gidiere |  |
+| server |  Redirect Configs      | tr7zw |  |
 | api |  Remove Streams using IntelliJ IDEA      | ㄗㄠˋ ㄑㄧˊ |  |
 | server |  Remove Streams using IntelliJ IDEA      | ㄗㄠˋ ㄑㄧˊ |  |
 | server |  Remove a few more streams      | Sotr |  |
@ -71,7 +69,7 @@ # Patches
 | server |  Swaps the predicate order of collision      | ㄗㄠˋ ㄑㄧˊ |  |
 | server |  Tweak Explosions      | Aikar |  |
 | api |  Yatopia API Bundle      | Bud Gidiere |  |
-| server |  Yatopia Server Fixes      | Bud Gidiere |  |
+| server |  Yatopia-Server-Fixes      | Bud Gidiere |  |
 | server |  dont load chunks for physics      | Aikar |  |
 | server |  lithium MixinBiome      | JellySquid |  |
 | server |  lithium MixinBox      | JellySquid |  |
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 60ce52a46b4881dc4665e22f11551d421233abb5
+Subproject commit a55a51bf42e54992fa5d11e9cf473e6ec0d50255
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit aaad5236e306dc53f022cf672f58e138fafa596e
+Subproject commit 49a491862f6363837c84c5e4f9f33dc72cbe0484
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 475ca7cbf73456c570adfb0573ea02b87ba5cef4
+Subproject commit 4513d90fef029c1c5cf0ed6c11d78caf6f003647
--- a/patches/Empirecraft/api.txt
+++ b/patches/Empirecraft/api.txt
@ -1 +1 @@
-Fix-PlayerInteractEvent-for-Armor-Stands&Add-ChatColor.getById
+Add-ChatColor.getById
--- a/patches/Rainforest/server.txt
+++ b/patches/Rainforest/server.txt
@ -1 +1 @@
-Add-Rainforest-config&Apply-advancements-async&Optimize-Pathfinder-Remove-Streams-Optimized-collect&Optimize-redstone-algorithm
+Add-Rainforest-config&Apply-advancements-async&Optimize-redstone-algorithm
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@ -353,10 +353,10 @@ index b005dd817e9ecffcf2172b4a807b0ecc632570b0..00000000000000000000000000000000
 -                     this.methodProfiler.exit();
 -                     this.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fe43603ecdc52f26fdaf4c94f14ea27e76b5a71b..a794e4523decded103b88433a5f63213fc243683 100644
+index 92aeb19d8e3a84048ad29fee5139434e3ace895f..74998ea20176c2753a0ebb03833f13f3f58a186a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -505,40 +505,40 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -506,40 +506,40 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
         double playerChunkZ = MathHelper.floor(player.locZ()) >> 4;
         pos.setValues(player.locX(), 0, player.locZ());
         double twoThirdModifier = 2D / 3D;
@ -412,7 +412,7 @@ index fe43603ecdc52f26fdaf4c94f14ea27e76b5a71b..a794e4523decded103b88433a5f63213
         }
 
         // Prioritize Frustum far 7
-@@ -1168,7 +1168,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1170,7 +1170,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                 }
 
                 this.getVillagePlace().loadInData(chunkcoordintpair, chunkHolder.poiData);
@ -628,7 +628,7 @@ index bada470cba41cce9beb9eb04227b42c1d489d731..00000000000000000000000000000000
 -     private int c;
 -     private TileEntityShulkerBox.AnimationPhase i;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0890bca50858ec8d544be2e1ff4ac2da73c7d830..44af511da96b265a8441052cc87e356e630699a6 100644
+index e789a828c31388810ed6a7a79e3a8f4557c62b62..9c42c2c027868e0357d2c75c1d477eecf358f1b4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -97,6 +97,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -653,7 +653,7 @@ index 0890bca50858ec8d544be2e1ff4ac2da73c7d830..44af511da96b265a8441052cc87e356e
         this.generator = gen;
         this.world = new CraftWorld((WorldServer) this, gen, env);
         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
-@@ -637,6 +645,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -641,6 +649,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
 
     public void b(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {}
 
@ -661,7 +661,7 @@ index 0890bca50858ec8d544be2e1ff4ac2da73c7d830..44af511da96b265a8441052cc87e356e
     public void applyPhysics(BlockPosition blockposition, Block block) {
         if (captureBlockStates) { return; } // Paper - Cancel all physics during placement
         this.a(blockposition.west(), block, blockposition);
-@@ -674,6 +683,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -678,6 +687,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
 
     }
 
--- a/patches/server/0022-Optimize-TileEntity-loading.patch
+++ b/patches/server/0022-Optimize-TileEntity-loading.patch
@ -32,7 +32,7 @@ index c2c19a6fbfa2a4aba21aa71789071c69a6246556..7dfd36e22a896ae440bbda6db0628c44
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 44af511da96b265a8441052cc87e356e630699a6..847a245606c5bb98a8821a9dcd677d7eb2e81e45 100644
+index 9c42c2c027868e0357d2c75c1d477eecf358f1b4..2977dadc19fa6bcafaa6f44a883eec235db8653d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
--- a/patches/server/0029-Akarin-updated-Async-Path-Finding.patch
+++ b/patches/server/0029-Akarin-updated-Async-Path-Finding.patch
@ -318,10 +318,10 @@ index 0c33a0c9d59d79a39826b5ee14144604717ffebe..cf3f4c1a2a89cce0345566a62faa34ef
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 22424e7e97015aae2ce3dc6c42eecef257e354e0..3365adb364fc9450dba773f4fe626b81c596f49c 100644
+index 997982136cdd2a0d922e501473e0d4d1aabf567a..9b2d23ef1c9369cf15f9f12161c28199fbf4f373 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
-@@ -23,7 +23,7 @@ public class Pathfinder {
+@@ -26,7 +26,7 @@ public class Pathfinder {
     }
 
     @Nullable