2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
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/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
2024-01-22 19:01:10 +01:00
|
|
|
index 22f7318711041bfc2847d519933c46b9fd523d01..4034b8e7503f611dc9be121d8da2020ae7155b8c 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
2023-09-21 22:35:39 +02:00
|
|
|
@@ -851,10 +851,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
2021-06-12 08:02:49 +02:00
|
|
|
@Override
|
|
|
|
public void thunderHit(ServerLevel world, LightningBolt lightning) {
|
|
|
|
if (world.getDifficulty() != Difficulty.PEACEFUL) {
|
|
|
|
- Villager.LOGGER.info("Villager {} was struck by lightning {}.", this, lightning);
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper - Add EntityZapEvent; move log down, event can cancel
|
2021-11-23 14:22:49 +01:00
|
|
|
Witch entitywitch = (Witch) EntityType.WITCH.create(world);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2022-12-07 19:52:24 +01:00
|
|
|
if (entitywitch != null) {
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper start - Add EntityZapEvent
|
2022-12-07 19:52:24 +01:00
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, lightning, entitywitch).isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if (org.spigotmc.SpigotConfig.logVillagerDeaths) Villager.LOGGER.info("Villager {} was struck by lightning {}.", this, lightning); // Move down
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - Add EntityZapEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2022-12-07 19:52:24 +01:00
|
|
|
entitywitch.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
|
|
|
|
entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
|
|
|
|
entitywitch.setNoAi(this.isNoAi());
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-02-01 10:15:57 +01:00
|
|
|
index 5d78797792977da434717d510004a548f461e6aa..60c0c8ac706386e089d1a4cbacb5442f63ea05dc 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -1265,6 +1265,14 @@ public class CraftEventFactory {
|
2023-07-04 10:22:56 +02:00
|
|
|
return !event.isCancelled();
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
2024-02-01 10:15:57 +01:00
|
|
|
+ public static com.destroystokyo.paper.event.entity.EntityZapEvent callEntityZapEvent(Entity entity, Entity lightning, Entity changedEntity) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ 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
|
|
|
|
+
|
2023-07-04 10:22:56 +02:00
|
|
|
public static boolean callEntityChangeBlockEvent(Entity entity, BlockPos position, net.minecraft.world.level.block.state.BlockState newBlock) {
|
|
|
|
return CraftEventFactory.callEntityChangeBlockEvent(entity, position, newBlock, false);
|
|
|
|
}
|