Paper/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch

63 lines
3.2 KiB
Diff
Raw Normal View History

From f4f90c3939dfe084f8fba90b9dd98d69e9f4fe90 Mon Sep 17 00:00:00 2001
2016-10-17 08:27:02 +02:00
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Sun, 16 Oct 2016 23:19:30 -0700
Subject: [PATCH] Add EntityZapEvent
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
2019-12-12 00:43:22 +01:00
index 5c24e22c7..8d277566e 100644
2016-10-17 08:27:02 +02:00
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
2019-12-12 00:43:22 +01:00
@@ -164,6 +164,12 @@ public class EntityPig extends EntityAnimal {
2019-04-27 08:26:04 +02:00
entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
}
2016-10-17 08:27:02 +02:00
2019-04-27 08:26:04 +02:00
+ // Paper start
+ if (CraftEventFactory.callEntityZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+ return;
+ }
+ // Paper end
2016-10-17 08:27:02 +02:00
+
2019-04-27 08:26:04 +02:00
// CraftBukkit start
if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
return;
2016-10-17 08:27:02 +02:00
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 1eca7f354..8b85956e5 100644
2016-10-17 08:27:02 +02:00
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -681,6 +681,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
2019-04-27 08:26:04 +02:00
public void onLightningStrike(EntityLightning entitylightning) {
EntityWitch entitywitch = (EntityWitch) EntityTypes.WITCH.a(this.world);
2016-10-17 08:27:02 +02:00
2019-04-27 08:26:04 +02:00
+ // Paper start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
+ return;
+ }
+ // Paper end
2016-10-17 08:27:02 +02:00
+
2019-12-12 00:43:22 +01:00
entitywitch.setPositionRotation(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
2019-04-27 08:26:04 +02:00
entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
entitywitch.setNoAI(this.isNoAI());
2016-10-17 08:27:02 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 72b8677f2..2d454a3c3 100644
2016-10-17 08:27:02 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1045,6 +1045,14 @@ public class CraftEventFactory {
2016-10-17 08:27:02 +02:00
return event;
}
+ // Paper start
+ public static com.destroystokyo.paper.event.entity.EntityZapEvent callEntityZapEvent (Entity entity, Entity lightning, Entity changedEntity) {
+ com.destroystokyo.paper.event.entity.EntityZapEvent event = new com.destroystokyo.paper.event.entity.EntityZapEvent(entity.getBukkitEntity(), (LightningStrike) lightning.getBukkitEntity(), changedEntity.getBukkitEntity());
+ entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
+ return event;
+ }
+ // Paper end
+
public static HorseJumpEvent callHorseJumpEvent(Entity horse, float power) {
2016-11-17 03:23:38 +01:00
HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
2016-10-17 08:27:02 +02:00
horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
--
2.24.1
2016-10-17 08:27:02 +02:00