Paper/Spigot-Server-Patches/0297-Add-More-Creeper-API.patch

66 Zeilen
2.5 KiB
Diff

From 8b23efffa1bd5e6504a1e277d38a44176e0322bc Mon Sep 17 00:00:00 2001
2018-08-27 09:01:09 +02:00
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Aug 2018 11:50:26 -0500
Subject: [PATCH] Add More Creeper API
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 1bb318e549..6bb63b9f90 100644
2018-08-27 09:01:09 +02:00
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
2019-05-05 10:33:44 +02:00
@@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
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> isIgnitedDW = d; // Paper OBFHELPER
private int bz;
2018-08-27 09:01:09 +02:00
- private int fuseTicks;
+ public int fuseTicks; // Paper - public
public int maxFuseTicks = 30;
public int explosionRadius = 3;
2019-05-05 10:33:44 +02:00
private int bD;
@@ -253,7 +253,18 @@ public class EntityCreeper extends EntityMonster {
2018-08-27 09:01:09 +02:00
}
public void ignite() {
- this.datawatcher.set(EntityCreeper.d, true);
+ // Paper start
+ setIgnited(true);
+ }
+
2018-08-27 09:01:09 +02:00
+ public void setIgnited(boolean ignited) {
+ if (isIgnited() != ignited) {
+ com.destroystokyo.paper.event.entity.CreeperIgniteEvent event = new com.destroystokyo.paper.event.entity.CreeperIgniteEvent((org.bukkit.entity.Creeper) getBukkitEntity(), ignited);
+ if (event.callEvent()) {
2019-05-05 10:33:44 +02:00
+ this.datawatcher.set(EntityCreeper.d, event.isIgnited());
+ }
+ }
2018-08-27 09:01:09 +02:00
+ // Paper end
}
public boolean canCauseHeadDrop() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
index 896405148c..075a5e77e2 100644
2018-08-27 09:01:09 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
2018-08-27 09:01:09 +02:00
public EntityType getType() {
return EntityType.CREEPER;
}
+
+ // Paper start
+ public void setIgnited(boolean ignited) {
+ getHandle().setIgnited(ignited);
+ }
+
+ public boolean isIgnited() {
+ return getHandle().isIgnited();
+ }
+
+ public int getFuseTicks() {
+ return getHandle().fuseTicks;
+ }
+ // Paper end
}
--
2.22.0
2018-08-27 09:01:09 +02:00