From f5f80a4aed1251b7a7d8a58d034f54b83333beee Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Mon, 14 Jun 2021 21:16:18 -0700 Subject: [PATCH] fixes --- patches/server/0679-More-Lidded-Block-API.patch | 4 ++-- .../server/0686-Fix-invulnerable-end-crystals.patch | 13 +++++++++---- .../0689-Fix-dangerous-end-portal-logic.patch | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/patches/server/0679-More-Lidded-Block-API.patch b/patches/server/0679-More-Lidded-Block-API.patch index 946581e92..646ca159b 100644 --- a/patches/server/0679-More-Lidded-Block-API.patch +++ b/patches/server/0679-More-Lidded-Block-API.patch @@ -37,7 +37,7 @@ index f48b830a9ae8160388cb0d0220a44b1ec9f0d214..5045507871db402305a43430194b4c5e + // Paper end - More Lidded Block API } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java -index 25add8bee6ea35beeb205dd828759304346e4f48..d4a5810111c81845c3b465468b470535f814889b 100644 +index 25add8bee6ea35beeb205dd828759304346e4f48..599f6747dfa140e40fef26ed4d8244bfe87b7cdf 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java @@ -14,4 +14,33 @@ public class CraftEnderChest extends CraftBlockEntityState type, Level world) { super(type, world); -@@ -67,8 +68,20 @@ public class EndCrystal extends Entity { +@@ -67,6 +68,17 @@ public class EndCrystal extends Entity { } // CraftBukkit end } @@ -49,7 +49,12 @@ index 2c4c1fc2a2afe88864b72d86708a3ddb6a1f50a0..5b9ba62ce37aabb268d76c23f5cb41a4 + // Paper end } -+ if (this.generatedByDragonFight) tag.putBoolean("Paper.GeneratedByDragonFight", this.generatedByDragonFight); // Paper - Fix invulnerable end crystals + } +@@ -78,6 +90,7 @@ public class EndCrystal extends Entity { + } + + nbt.putBoolean("ShowBottom", this.showsBottom()); ++ if (this.generatedByDragonFight) nbt.putBoolean("Paper.GeneratedByDragonFight", this.generatedByDragonFight); // Paper - Fix invulnerable end crystals } @Override @@ -57,7 +62,7 @@ index 2c4c1fc2a2afe88864b72d86708a3ddb6a1f50a0..5b9ba62ce37aabb268d76c23f5cb41a4 if (nbt.contains("ShowBottom", 1)) { this.setShowBottom(nbt.getBoolean("ShowBottom")); } -+ if (tag.contains("Paper.GeneratedByDragonFight", 1)) this.generatedByDragonFight = tag.getBoolean("Paper.GeneratedByDragonFight"); // Paper - Fix invulnerable end crystals ++ if (nbt.contains("Paper.GeneratedByDragonFight", 1)) this.generatedByDragonFight = nbt.getBoolean("Paper.GeneratedByDragonFight"); // Paper - Fix invulnerable end crystals } diff --git a/patches/server/0689-Fix-dangerous-end-portal-logic.patch b/patches/server/0689-Fix-dangerous-end-portal-logic.patch index 3eea2269f..d7b1eefe9 100644 --- a/patches/server/0689-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0689-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5d4bee5470795bd9f362fff5ae653794223fa182..3e665504ff2138f8bc40cfac74b5af722d91f6e9 100644 +index 5d4bee5470795bd9f362fff5ae653794223fa182..b2478c6aee858c362f92c292635bb14f812ccf0b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -341,6 +341,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -31,7 +31,7 @@ index 5d4bee5470795bd9f362fff5ae653794223fa182..3e665504ff2138f8bc40cfac74b5af72 + return; + } + -+ if (this.isPassenger() || this.isVehicle() || !this.canChangeDimensions() || this.removed || !this.valid || !this.isAlive()) { ++ if (this.isPassenger() || this.isVehicle() || !this.canChangeDimensions() || this.isRemoved() || !this.valid || !this.isAlive()) { + return; + } +