core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstreams

This commit is contained in:
Zach Brown 2016-05-29 18:32:21 -05:00
parent 0a98d670fe
commit 0ae5768736
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0101-Use-correct-item-in-arrow-pickup-event.patch
View File

@ -1,14 +1,14 @@
From 9ed5eb00e14ac2cc32809189cb1b1a890f91702a Mon Sep 17 00:00:00 2001 From eb217058835488239a3de68d40ea778ac2244d3b Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 22 Mar 2016 16:00:16 -0400 Date: Tue, 22 Mar 2016 16:00:16 -0400
Subject: [PATCH] Use correct item in arrow pickup event Subject: [PATCH] Use correct item in arrow pickup event
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index c2ee9ce..f6b7453 100644 index 0cfca26..069a1b7 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java --- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -432,7 +432,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -431,7 +431,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
public void d(EntityHuman entityhuman) { public void d(EntityHuman entityhuman) {
if (!this.world.isClientSide && this.inGround && this.shake <= 0) { if (!this.world.isClientSide && this.inGround && this.shake <= 0) {
// CraftBukkit start // CraftBukkit start
@ -17,7 +17,7 @@ index c2ee9ce..f6b7453 100644
if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) { if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) {
EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack); EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack);
@@ -447,7 +447,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -446,7 +446,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
// CraftBukkit end // CraftBukkit end
boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild; boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild;
@ -27,5 +27,5 @@ index c2ee9ce..f6b7453 100644
} }
-- --
2.8.2 2.8.3.windows.1

2
work/Bukkit

@ -1 +1 @@
Subproject commit 7c7228c87abb4e787dd466e47e3c30a7757945ea Subproject commit 8070822510bfb64a20c3d0101b69164482732d7d

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 106ced01e0bd24a20633d4f3aa99c2452736be74 Subproject commit 71e5248c8b97a6345a367543bdb8a85477baf81b