Update upstreams
This commit is contained in:
@@ -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>
|
||||
Date: Tue, 22 Mar 2016 16:00:16 -0400
|
||||
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
|
||||
index c2ee9ce..f6b7453 100644
|
||||
index 0cfca26..069a1b7 100644
|
||||
--- a/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) {
|
||||
if (!this.world.isClientSide && this.inGround && this.shake <= 0) {
|
||||
// CraftBukkit start
|
||||
@@ -17,7 +17,7 @@ index c2ee9ce..f6b7453 100644
|
||||
if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) {
|
||||
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
|
||||
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
|
||||
|
||||
|
||||
Submodule work/Bukkit updated: 7c7228c87a...8070822510
Submodule work/CraftBukkit updated: 106ced01e0...71e5248c8b
Reference in New Issue
Block a user