From eb7288a5a07506e694f6ff8dc419d74e03b8d150 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 Sep 2021 22:50:41 -0500 Subject: [PATCH] [ci-skip] cleanup --- ...or-beds-to-explode-on-villager-sleep.patch | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch index 6ad3f7814..8ce370f34 100644 --- a/patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0255-Option-for-beds-to-explode-on-villager-sleep.patch @@ -5,32 +5,24 @@ Subject: [PATCH] Option for beds to explode on villager sleep diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 597d21bd2d7dde000e02986557be205380e2aa0a..e5adfd16d132828727040b56a90c1173c9b71a44 100644 +index 597d21bd2d7dde000e02986557be205380e2aa0a..e88465e5ce0cc4537027a802443159c39bab1c6d 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1175,10 +1175,16 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1175,6 +1175,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public void startSleeping(BlockPos pos) { -- super.startSleeping(pos); -- this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error -- this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); -- this.brain.eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE); + // Purpur start + if (level.purpurConfig.bedExplodeOnVillagerSleep && this.level.getBlockState(pos).getBlock() instanceof net.minecraft.world.level.block.BedBlock) { -+ this.level.explode(null, DamageSource.explosion((net.minecraft.world.level.Explosion) null), null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (float) this.level.purpurConfig.bedExplosionPower, this.level.purpurConfig.bedExplosionFire, this.level.purpurConfig.bedExplosionEffect); -+ } else { -+ super.startSleeping(pos); -+ this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error -+ this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); -+ this.brain.eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE); ++ this.level.explode(null, DamageSource.explosion(this), null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (float) this.level.purpurConfig.bedExplosionPower, this.level.purpurConfig.bedExplosionFire, this.level.purpurConfig.bedExplosionEffect); ++ return; + } + // Purpur end - } - - @Override + super.startSleeping(pos); + this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error + this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 467cc1e7166875c929b4d39f7ed3d7c2f12991e6..702ed3dd224982989060295f3ca07a6459072c65 100644 +index 7f1914083d60c7e6eeb12c700004fc3f9846f039..ecc07192df1b7c3e712d4ca415a13241b23dd94d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -731,11 +731,13 @@ public class PurpurWorldConfig {