aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0251-Add-More-Creeper-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0251-Add-More-Creeper-API.patch')
-rw-r--r--patches/server/0251-Add-More-Creeper-API.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/patches/server/0251-Add-More-Creeper-API.patch b/patches/server/0251-Add-More-Creeper-API.patch
new file mode 100644
index 0000000000..701306ca69
--- /dev/null
+++ b/patches/server/0251-Add-More-Creeper-API.patch
@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Fri, 24 Aug 2018 11:50:26 -0500
+Subject: [PATCH] Add More Creeper API
+
+
+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 bc493838420a6857ebc86f84cabdc1b6e3e637a4..e0f71dc12cfc28710cacfbc372026f556dcab165 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+@@ -133,7 +133,7 @@ public class Creeper extends Monster implements PowerableMob {
+ }
+
+ if (nbt.getBoolean("ignited")) {
+- this.ignite();
++ this.entityData.set(Creeper.DATA_IS_IGNITED, true); // Paper - set directly to avoid firing event
+ }
+
+ }
+@@ -309,7 +309,18 @@ public class Creeper extends Monster implements PowerableMob {
+ }
+
+ public void ignite() {
+- this.entityData.set(Creeper.DATA_IS_IGNITED, true);
++ // Paper start
++ setIgnited(true);
++ }
++
++ 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()) {
++ this.entityData.set(Creeper.DATA_IS_IGNITED, event.isIgnited());
++ }
++ }
++ // Paper end
+ }
+
+ public boolean canDropMobsSkull() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+index ea9dc2219cdff3976796e4848b0faa278656be63..63a8188010f045d5c17a1ecb63e8081ec86c2960 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+@@ -94,4 +94,16 @@ public class CraftCreeper extends CraftMonster implements Creeper {
+ public EntityType getType() {
+ return EntityType.CREEPER;
+ }
++
++ // Paper start
++ @Override
++ public void setIgnited(boolean ignited) {
++ getHandle().setIgnited(ignited);
++ }
++
++ @Override
++ public boolean isIgnited() {
++ return getHandle().isIgnited();
++ }
++ // Paper end
+ }