SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2017-06-25 18:00:32 -05:00
parent 7409728bf3
commit 3f5b488720
13 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 08315599..6ed3d790 100644
index dc52ef45b..fa207c579 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -17,7 +17,7 @@ index 08315599..6ed3d790 100644
if (this.pickupDelay <= 0 && canHold > 0) {
itemstack.setCount(canHold);
@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
// event.setCancelled(!entityhuman.canPickUpLoot); TODO
event.setCancelled(!entityhuman.canPickUpLoot);
this.world.getServer().getPluginManager().callEvent(event);
itemstack.setCount(canHold + remaining);
+ flyAtPlayer = event.getFlyAtPlayer(); // Paper