mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 17:37:45 +01:00
a0b8b886c8
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:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+
Spigot Changes:
2740d5ae Rebuild patches
29 lines
1.6 KiB
Diff
29 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/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
index 749c6e21cbd01a81196476728def640ba46a5783..055272e49ff522a009fcd335e2183172ada11c35 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> 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;
|
|
private int fuseTicks;
|
|
public int maxFuseTicks = 30;
|
|
@@ -217,6 +217,7 @@ public class EntityCreeper extends EntityMonster {
|
|
this.createEffectCloud();
|
|
} else {
|
|
fuseTicks = 0;
|
|
+ this.datawatcher.set(isIgnitedDW, Boolean.valueOf(false)); // Paper
|
|
}
|
|
// CraftBukkit end
|
|
}
|