mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
1ab021ddca
Upstream has released updates that appears 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:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 9 Feb 2020 00:19:05 -0600
|
|
Subject: [PATCH] Add ThrownEggHatchEvent
|
|
|
|
Adds a new event similar to PlayerEggThrowEvent, but without the Player requirement
|
|
(dispensers can throw eggs to hatch them, too).
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
|
|
index 0d5e91a4204c394efcc510d34011f32f2e313ab1..edce89169b3ca2894852087b83a6bf035ba43c3f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEgg.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEgg.java
|
|
@@ -55,6 +55,16 @@ public class EntityEgg extends EntityProjectileThrowable {
|
|
hatchingType = event.getHatchingType();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ com.destroystokyo.paper.event.entity.ThrownEggHatchEvent event = new com.destroystokyo.paper.event.entity.ThrownEggHatchEvent((org.bukkit.entity.Egg) getBukkitEntity(), hatching, b0, hatchingType);
|
|
+ event.callEvent();
|
|
+
|
|
+ b0 = event.getNumHatches();
|
|
+ hatching = event.isHatching();
|
|
+ hatchingType = event.getHatchingType();
|
|
+ // Paper end
|
|
+
|
|
+
|
|
if (hatching) {
|
|
for (int i = 0; i < b0; ++i) {
|
|
Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F), hatchingType.getEntityClass());
|