mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
a981965852
Upstream has released updates that appear 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: b302317a SPIGOT-5877: Add scaffolding for custom dimensions and biomes ccccb625 SPIGOT-6417: Add Creeper fuse ticks API CraftBukkit Changes: 0e26ddb6 SPIGOT-5877: Add scaffolding for custom dimensions and biomes 170d6feb SPIGOT-6417: Add Creeper fuse ticks API
28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 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/world/entity/monster/EntityCreeper.java b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
|
|
index 08292753f925f33d75f3aca835c1fd19494b22ec..cbb973e077e04e5221bcc837f434b7093bdbcc2a 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
|
|
@@ -48,7 +48,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 bo;
|
|
public int fuseTicks; // PAIL
|
|
public int maxFuseTicks = 30;
|
|
@@ -253,6 +253,7 @@ public class EntityCreeper extends EntityMonster {
|
|
this.createEffectCloud();
|
|
} else {
|
|
fuseTicks = 0;
|
|
+ this.datawatcher.set(isIgnitedDW, Boolean.valueOf(false)); // Paper
|
|
}
|
|
// CraftBukkit end
|
|
}
|