From 1af3ae48775ba988c0f156c22e493f33fd4cb57b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Aug 2020 20:23:12 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: dccaf59a MC-197883: Bandaid decode issue 99a1e58f Merge branch 'master' into progress/1.16.2 7470c3ef Do not let the server load chunks from newer versions (1.16.2+) ecbc5ca0 Updated Upstream (CraftBukkit) --- Paper | 2 +- current-paper | 2 +- .../server/0001-Tuinity-Server-Changes.patch | 4 ++-- .../server/0043-Tulips-change-fox-type.patch | 4 ++-- ...o-disable-saving-projectiles-to-disk.patch | 8 ++++---- ...o-disable-dolphin-treasure-searching.patch | 4 ++-- patches/server/0126-Ridables.patch | 20 +++++++++---------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Paper b/Paper index 99362d3c7..dccaf59a0 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 99362d3c7951ab06912e66fe17f72f16077eec65 +Subproject commit dccaf59a09623f7d6bc00e755f2b6f396db7dac4 diff --git a/current-paper b/current-paper index 18c606f5d..7c2b61f99 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.2--44ea77fa436426246fcf1ab2e3dddcf9eed52bb5 +1.16.2--1e60a83ce374a1c2d26ac5de6f44b645e7b6fc7c diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 1e290286c..182ece5a9 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -2614,7 +2614,7 @@ index 45c142c22..6c41eb14d 100644 try { boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 335bb1dcb..e74d21048 100644 +index a0353da42..c2adc7f52 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -24,6 +24,14 @@ public class ChunkRegionLoader { @@ -2632,7 +2632,7 @@ index 335bb1dcb..e74d21048 100644 // Paper start - guard against serializing mismatching coordinates // TODO Note: This needs to be re-checked each update public static ChunkCoordIntPair getChunkCoordinate(NBTTagCompound chunkData) { -@@ -374,10 +382,10 @@ public class ChunkRegionLoader { +@@ -388,10 +396,10 @@ public class ChunkRegionLoader { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); nbttagcompound.setInt("DataVersion", SharedConstants.getGameVersion().getWorldVersion()); diff --git a/patches/server/0043-Tulips-change-fox-type.patch b/patches/server/0043-Tulips-change-fox-type.patch index 311df01ff..db8b0954d 100644 --- a/patches/server/0043-Tulips-change-fox-type.patch +++ b/patches/server/0043-Tulips-change-fox-type.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Tulips change fox type diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index eba33eeb6..f47a78e56 100644 +index 0ac0364ff..04b2bbea0 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -37,9 +37,9 @@ public class EntityFox extends EntityAnimal { @@ -41,7 +41,7 @@ index eba33eeb6..f47a78e56 100644 } private List fa() { -@@ -575,6 +581,27 @@ public class EntityFox extends EntityAnimal { +@@ -576,6 +582,27 @@ public class EntityFox extends EntityAnimal { return this.fa().contains(uuid); } diff --git a/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch index 6b00daa37..6d25ede1e 100644 --- a/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch +++ b/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable saving projectiles to disk diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index e74d21048..21bd84a73 100644 +index c2adc7f52..24a6102b3 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -@@ -475,6 +475,7 @@ public class ChunkRegionLoader { +@@ -489,6 +489,7 @@ public class ChunkRegionLoader { while (iterator1.hasNext()) { Entity entity = (Entity) iterator1.next(); @@ -17,10 +17,10 @@ index e74d21048..21bd84a73 100644 // Paper start if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 179e470fe..f3e9c8460 100644 +index 6d809cc78..15e5fc122 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -309,6 +309,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.headHeight = this.getHeadHeight(EntityPose.STANDING, this.size); } diff --git a/patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch index a56af3a1d..5f7e0a941 100644 --- a/patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index 8d9ab06c8..0f51dbf8d 100644 +index b5191eb0b..cde5c46fe 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java -@@ -328,6 +328,7 @@ public class EntityDolphin extends EntityWaterAnimal { +@@ -329,6 +329,7 @@ public class EntityDolphin extends EntityWaterAnimal { @Override public boolean a() { diff --git a/patches/server/0126-Ridables.patch b/patches/server/0126-Ridables.patch index 4b4078e04..14d6dcc53 100644 --- a/patches/server/0126-Ridables.patch +++ b/patches/server/0126-Ridables.patch @@ -995,7 +995,7 @@ index 013639cc9..3ddfb5f34 100644 } // Paper end diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java -index 0f51dbf8d..09a3a00e3 100644 +index cde5c46fe..306454060 100644 --- a/src/main/java/net/minecraft/server/EntityDolphin.java +++ b/src/main/java/net/minecraft/server/EntityDolphin.java @@ -17,6 +17,7 @@ public class EntityDolphin extends EntityWaterAnimal { @@ -1077,7 +1077,7 @@ index 0f51dbf8d..09a3a00e3 100644 } @Override -@@ -194,6 +236,9 @@ public class EntityDolphin extends EntityWaterAnimal { +@@ -195,6 +237,9 @@ public class EntityDolphin extends EntityWaterAnimal { @Override public void tick() { super.tick(); @@ -1087,7 +1087,7 @@ index 0f51dbf8d..09a3a00e3 100644 if (this.isNoAI()) { this.setAirTicks(this.bG()); } else { -@@ -467,7 +512,7 @@ public class EntityDolphin extends EntityWaterAnimal { +@@ -468,7 +513,7 @@ public class EntityDolphin extends EntityWaterAnimal { private int b; @@ -1096,7 +1096,7 @@ index 0f51dbf8d..09a3a00e3 100644 @Override public boolean a() { -@@ -535,7 +580,7 @@ public class EntityDolphin extends EntityWaterAnimal { +@@ -536,7 +581,7 @@ public class EntityDolphin extends EntityWaterAnimal { } } @@ -1105,7 +1105,7 @@ index 0f51dbf8d..09a3a00e3 100644 private final EntityDolphin i; -@@ -545,7 +590,20 @@ public class EntityDolphin extends EntityWaterAnimal { +@@ -546,7 +591,20 @@ public class EntityDolphin extends EntityWaterAnimal { } @Override @@ -1571,7 +1571,7 @@ index 08372b722..6a8e15f01 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index f47a78e56..a3447a530 100644 +index 04b2bbea0..a73335e36 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -55,6 +55,39 @@ public class EntityFox extends EntityAnimal { @@ -1638,7 +1638,7 @@ index f47a78e56..a3447a530 100644 private void m(ItemStack itemstack) { if (!itemstack.isEmpty() && !this.world.isClientSide) { EntityItem entityitem = new EntityItem(this.world, this.locX() + this.getLookDirection().x, this.locY() + 1.0D, this.locZ() + this.getLookDirection().z, itemstack); -@@ -480,6 +516,7 @@ public class EntityFox extends EntityAnimal { +@@ -481,6 +517,7 @@ public class EntityFox extends EntityAnimal { return this.t(16); } @@ -1646,7 +1646,7 @@ index f47a78e56..a3447a530 100644 public void u(boolean flag) { this.d(16, flag); } -@@ -522,6 +559,7 @@ public class EntityFox extends EntityAnimal { +@@ -523,6 +560,7 @@ public class EntityFox extends EntityAnimal { this.setSleeping(false); } @@ -1654,7 +1654,7 @@ index f47a78e56..a3447a530 100644 private void fd() { this.w(false); this.setCrouching(false); -@@ -687,16 +725,16 @@ public class EntityFox extends EntityAnimal { +@@ -688,16 +726,16 @@ public class EntityFox extends EntityAnimal { } } @@ -1674,7 +1674,7 @@ index f47a78e56..a3447a530 100644 } } -@@ -1366,16 +1404,16 @@ public class EntityFox extends EntityAnimal { +@@ -1367,16 +1405,16 @@ public class EntityFox extends EntityAnimal { } }