2018-12-17 06:18:06 +01:00
|
|
|
From 76212749b31aa78325f5a0500a66dc67830d247b 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
|
2018-12-17 06:18:06 +01:00
|
|
|
index 7ef67350a..9dc2d8be2 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
|
2018-12-08 11:09:55 +01:00
|
|
|
@@ -163,6 +163,12 @@ public class EntityPig extends EntityAnimal {
|
|
|
|
entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
|
|
|
|
}
|
2016-10-17 08:27:02 +02:00
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ if (CraftEventFactory.callEntityZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
// CraftBukkit start
|
|
|
|
if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
|
|
|
|
return;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
2018-12-17 06:18:06 +01:00
|
|
|
index d2572b3e1..ddf170180 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
|
2018-12-08 11:09:55 +01:00
|
|
|
@@ -607,6 +607,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
|
2016-10-17 08:27:02 +02:00
|
|
|
if (!this.world.isClientSide && !this.dead) {
|
|
|
|
EntityWitch entitywitch = new EntityWitch(this.world);
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
entitywitch.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
|
2018-07-16 22:08:09 +02:00
|
|
|
entitywitch.prepare(this.world.getDamageScaler(new BlockPosition(entitywitch)), (GroupDataEntity) null, (NBTTagCompound) null);
|
2017-05-21 06:41:39 +02:00
|
|
|
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
|
2018-12-17 06:18:06 +01:00
|
|
|
index 35992c4ba..075e6f04e 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
|
2018-12-17 06:18:06 +01:00
|
|
|
@@ -851,6 +851,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);
|
|
|
|
--
|
2018-12-17 06:18:06 +01:00
|
|
|
2.20.0
|
2016-10-17 08:27:02 +02:00
|
|
|
|