mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 6fef741f0bb6edefa05c3c0187aaa134adae4a8f Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 10 Jun 2018 01:18:49 -0400
|
|
Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
|
|
|
|
Otherwise the creeper infinite explodes
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
index 374cf28fb4..b895300797 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
@@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
|
|
|
|
private static final DataWatcherObject<Integer> b = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.b);
|
|
private static final DataWatcherObject<Boolean> POWERED = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
|
|
- private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
|
|
+ private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject<Boolean> isIgnitedDW = d; // Paper OBFHELPER
|
|
private int bw;
|
|
private int fuseTicks;
|
|
public int maxFuseTicks = 30;
|
|
@@ -219,6 +219,7 @@ public class EntityCreeper extends EntityMonster {
|
|
this.createEffectCloud();
|
|
} else {
|
|
fuseTicks = 0;
|
|
+ this.datawatcher.set(isIgnitedDW, Boolean.valueOf(false)); // Paper
|
|
}
|
|
// CraftBukkit end
|
|
}
|
|
--
|
|
2.25.1
|
|
|