b922ff9886
This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
From 59229f9f6883b137fa2f63aa3e4cb239c607fb83 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 8098d4d9f..67ba72fc1 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> a = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.b);
|
|
private static final DataWatcherObject<Boolean> b = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.h);
|
|
- private static final DataWatcherObject<Boolean> c = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.h);
|
|
+ private static final DataWatcherObject<Boolean> c = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.h); private static final DataWatcherObject<Boolean> isIgnitedDW = c; // Paper OBFHELPER
|
|
private int bx;
|
|
private int fuseTicks;
|
|
public int maxFuseTicks = 30; // PAIL private -> public
|
|
@@ -213,6 +213,7 @@ public class EntityCreeper extends EntityMonster {
|
|
this.ds();
|
|
} else {
|
|
fuseTicks = 0;
|
|
+ this.datawatcher.set(isIgnitedDW, Boolean.valueOf(false)); // Paper
|
|
}
|
|
// CraftBukkit end
|
|
}
|
|
--
|
|
2.18.0
|
|
|