From ffab9f8e45f053b33f08497b1d5c1fd8f5609013 Mon Sep 17 00:00:00 2001 From: granny Date: Tue, 20 Jun 2023 16:53:45 -0700 Subject: [PATCH] stop spawned wither skulls from saving to disk, not withers fixes #1357 --- .../0056-Add-canSaveToDisk-to-Entity.patch | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/server/0056-Add-canSaveToDisk-to-Entity.patch b/patches/server/0056-Add-canSaveToDisk-to-Entity.patch index 5464d7937..3edd7243c 100644 --- a/patches/server/0056-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0056-Add-canSaveToDisk-to-Entity.patch @@ -20,21 +20,21 @@ index 3bf477438d30f6ea3bbf3cbc33cf0b5743452ffd..03811b4dca610cf0fa3dc6ca0cc7f47d return this.hardCollides; } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 38800a318f675ab11eeba17cb1966e9a294c69e1..a20017a6086421061ee13df9cf37e08eeb515a5b 100644 +index 38800a318f675ab11eeba17cb1966e9a294c69e1..fd3cb168faeb11365edee3ccefe04d60a0c819b2 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -@@ -229,6 +229,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob +@@ -225,6 +225,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob + // do not hit rider + return target != rider && super.canHitEntity(target); + } ++ ++ @Override ++ public boolean canSaveToDisk() { ++ return false; ++ } + }; skull.setPosRaw(headX, headY, headZ); level().addFreshEntity(skull); - } -+ -+ @Override -+ public boolean canSaveToDisk() { -+ return false; -+ } - // Purpur end - - @Override diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java index 060e064625969610539dbf969ce773b877a7c579..32cd9df202704cdfb8fa06aaf0e738d483054feb 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java