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

NOT FINISHED! 1.13-pre7 - even more patches!

Browse Source 
Patches, patches everywhere!
This commit is contained in:
Shane Freeder
2018-07-18 01:08:13 +01:00
parent c8d8659ad3
commit 3cb169aa7c
50 changed files with 273 additions and 1171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ 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 99dbb1393..ae4910b4b 100644
index f2a4476c5..62d1c3d11 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 {
@@ -0,0 +0,0 @@ public class EntityItem extends Entity {
// CraftBukkit start - fire PlayerPickupItemEvent
int canHold = entityhuman.inventory.canHold(itemstack);
int remaining = i - canHold;
@@ -16,7 +16,7 @@ index 99dbb1393..ae4910b4b 100644
if (this.pickupDelay <= 0 && canHold > 0) {
itemstack.setCount(canHold);
@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -0,0 +0,0 @@ public class EntityItem extends Entity {
PlayerPickupItemEvent playerEvent = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
playerEvent.setCancelled(!entityhuman.canPickUpLoot);
this.world.getServer().getPluginManager().callEvent(playerEvent);
@@ -30,11 +30,10 @@ index 99dbb1393..ae4910b4b 100644
return;
}
@@ -0,0 +0,0 @@ public class EntityItem extends Entity implements HopperPusher {
// CraftBukkit end
@@ -0,0 +0,0 @@ public class EntityItem extends Entity {
if (this.pickupDelay == 0 && (this.h == null || 6000 - this.age <= 200 || this.h.equals(entityhuman.getName())) && entityhuman.inventory.pickup(itemstack)) {
- entityhuman.receive(this, i);
if (this.pickupDelay == 0 && (this.g == null || 6000 - this.age <= 200 || this.g.equals(entityhuman.getUniqueID())) && entityhuman.inventory.pickup(itemstack)) {
entityhuman.receive(this, i);
+ // Paper Start
+ if (flyAtPlayer) {
+ entityhuman.receive(this, i);