459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
45 Zeilen
1.7 KiB
Diff
45 Zeilen
1.7 KiB
Diff
From 9c188947d2debdea36e4796d455b317400fb7bd3 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 11 Jun 2017 16:30:30 -0500
|
|
Subject: [PATCH] PlayerAttemptPickupItemEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
|
index d9d52a63d8..946e59753e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
|
|
import org.bukkit.event.entity.EntityPickupItemEvent;
|
|
import org.bukkit.event.player.PlayerPickupItemEvent;
|
|
// CraftBukkit end
|
|
+import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper
|
|
|
|
public class EntityItem extends Entity {
|
|
|
|
@@ -310,6 +311,22 @@ public class EntityItem extends Entity {
|
|
int remaining = i - canHold;
|
|
boolean flyAtPlayer = false; // Paper
|
|
|
|
+ // Paper start
|
|
+ if (this.pickupDelay <= 0) {
|
|
+ PlayerAttemptPickupItemEvent attemptEvent = new PlayerAttemptPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
|
|
+ this.world.getServer().getPluginManager().callEvent(attemptEvent);
|
|
+
|
|
+ flyAtPlayer = attemptEvent.getFlyAtPlayer();
|
|
+ if (attemptEvent.isCancelled()) {
|
|
+ if (flyAtPlayer) {
|
|
+ entityhuman.receive(this, i);
|
|
+ }
|
|
+
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
if (this.pickupDelay <= 0 && canHold > 0) {
|
|
itemstack.setCount(canHold);
|
|
// Call legacy event
|
|
--
|
|
2.19.0
|
|
|