mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
2f782a6652
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 CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 8ecafc508a17ba2644d911bc870ba36fc3a05327 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 9f03d03375..29569805cb 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
@@ -11,7 +11,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 bz;
|
|
private int fuseTicks;
|
|
public int maxFuseTicks = 30;
|
|
@@ -216,6 +216,7 @@ public class EntityCreeper extends EntityMonster {
|
|
this.createEffectCloud();
|
|
} else {
|
|
fuseTicks = 0;
|
|
+ this.datawatcher.set(isIgnitedDW, Boolean.valueOf(false)); // Paper
|
|
}
|
|
// CraftBukkit end
|
|
}
|
|
--
|
|
2.21.0
|
|
|