twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-08 16:12:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.10

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-06-09 11:43:49 +10:00
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/EntityItem.patch
View File

@@ -44,7 +44,7 @@
this.lastX = this.locX;
this.lastY = this.locY;
@@ -93,12 +103,20 @@
@@ -96,12 +106,20 @@
this.motY *= -0.5D;
}
@@ -54,7 +54,7 @@
}
+ // Craftbukkit end */
this.aj();
this.ak();
if (!this.world.isClientSide && this.age >= 6000) {
+ // CraftBukkit start - fire ItemDespawnEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
@@ -65,7 +65,7 @@
this.die();
}
@@ -140,6 +158,7 @@
@@ -143,6 +161,7 @@
} else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
return false;
} else {
@@ -73,7 +73,7 @@
itemstack1.count += itemstack.count;
entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay);
entityitem.age = Math.min(entityitem.age, this.age);
@@ -186,6 +205,11 @@
@@ -189,6 +208,11 @@
} else if (this.getItemStack() != null && this.getItemStack().getItem() == Items.NETHER_STAR && damagesource.isExplosion()) {
return false;
} else {
@@ -82,10 +82,10 @@
+ return false;
+ }
+ // CraftBukkit end
this.ao();
this.ap();
this.f = (int) ((float) this.f - f);
if (this.f <= 0) {
@@ -231,7 +255,18 @@
@@ -238,7 +262,18 @@
NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Item");
@@ -105,7 +105,7 @@
if (this.getItemStack() == null) {
this.die();
}
@@ -243,6 +278,26 @@
@@ -250,6 +285,26 @@
ItemStack itemstack = this.getItemStack();
int i = itemstack.count;