2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
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/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
2023-07-04 10:22:56 +02:00
|
|
|
index 17ce05e7f9d2615be28a095ef6d3126885df8771..7fe90ebc8eced53f72c7f935e40745075f02421b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
|
2022-12-07 20:22:28 +01:00
|
|
|
@@ -132,7 +132,7 @@ public class Creeper extends Monster implements PowerableMob {
|
2022-07-31 19:14:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (nbt.getBoolean("ignited")) {
|
|
|
|
- this.ignite();
|
|
|
|
+ this.entityData.set(Creeper.DATA_IS_IGNITED, true); // Paper - set directly to avoid firing event
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2023-07-04 10:22:56 +02:00
|
|
|
@@ -315,7 +315,18 @@ public class Creeper extends Monster implements PowerableMob {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2023-08-14 01:32:51 +02:00
|
|
|
index e9a9154804bf2b26f4c613e81819e1cf448b76d0..6ccb32786b3abe1109dcc2d083cd231b70d8c6b4 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
2023-08-14 01:32:51 +02:00
|
|
|
@@ -88,4 +88,16 @@ public class CraftCreeper extends CraftMonster implements Creeper {
|
|
|
|
public String toString() {
|
|
|
|
return "CraftCreeper";
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
2021-06-13 01:45:00 +02:00
|
|
|
+ @Override
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public void setIgnited(boolean ignited) {
|
|
|
|
+ getHandle().setIgnited(ignited);
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-13 01:45:00 +02:00
|
|
|
+ @Override
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public boolean isIgnited() {
|
|
|
|
+ return getHandle().isIgnited();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|