mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
29 lines
1.7 KiB
Diff
29 lines
1.7 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/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||
|
|
index 8f8d0a23d011936150854a0606be3d63b18c57af..d9b5cf8ac01289801ded01d928fa7ead96551be5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
||
|
|
@@ -47,7 +47,7 @@ public class Creeper extends Monster {
|
||
|
|
|
||
|
|
private static final EntityDataAccessor<Integer> DATA_SWELL_DIR = SynchedEntityData.defineId(Creeper.class, EntityDataSerializers.INT);
|
||
|
|
private static final EntityDataAccessor<Boolean> DATA_IS_POWERED = SynchedEntityData.defineId(Creeper.class, EntityDataSerializers.BOOLEAN);
|
||
|
|
- private static final EntityDataAccessor<Boolean> DATA_IS_IGNITED = SynchedEntityData.defineId(Creeper.class, EntityDataSerializers.BOOLEAN);
|
||
|
|
+ private static final EntityDataAccessor<Boolean> DATA_IS_IGNITED = SynchedEntityData.defineId(Creeper.class, EntityDataSerializers.BOOLEAN); private static final EntityDataAccessor<Boolean> isIgnitedDW = DATA_IS_IGNITED; // Paper OBFHELPER
|
||
|
|
private int oldSwell;
|
||
|
|
public int swell; // PAIL
|
||
|
|
public int maxSwell = 30;
|
||
|
|
@@ -252,6 +252,7 @@ public class Creeper extends Monster {
|
||
|
|
this.spawnLingeringCloud();
|
||
|
|
} else {
|
||
|
|
swell = 0;
|
||
|
|
+ this.entityData.set(isIgnitedDW, Boolean.valueOf(false)); // Paper
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|