Unset Ignited flag on cancel of Explosion Event

Otherwise the creeper infinite explodes
This commit is contained in:
Aikar 2018-06-10 01:29:20 -04:00
parent 586435d325
commit 4fbed1adab
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,31 @@
From 5799dcb1f539d2d4bab8ae470cf7be71d2c8bcbc 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.17.1