Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 10:35:38 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown 2017-02-10 18:12:58 -06:00
parent 6b3c0bb3c6
commit 5031a31da5
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0065-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -1,11 +1,11 @@
From 73d194d5f867e136da9d1f67208185c63001a13d Mon Sep 17 00:00:00 2001 From 694e45177f8e7253cd0dd865cc31d8bc3ca6a841 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc> From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:43:39 -0600 Date: Sun, 25 Nov 2012 13:43:39 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a2d476818..193dadf43 100644 index a2d4768..193dadf 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1380,10 +1380,12 @@ public abstract class EntityLiving extends Entity { @@ -1380,10 +1380,12 @@ public abstract class EntityLiving extends Entity {
@ -22,10 +22,10 @@ index a2d476818..193dadf43 100644
this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i)); this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i));
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 5520c707e..eeb4f5b32 100644 index 61032eb..348a8c7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -566,4 +566,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -572,4 +572,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public boolean isCollidable() { public boolean isCollidable() {
return getHandle().collides; return getHandle().collides;
} }
@ -43,5 +43,5 @@ index 5520c707e..eeb4f5b32 100644
+ // Paper end + // Paper end
} }
-- --
2.11.0 2.9.3

12
Spigot-Server-Patches/0125-Improve-Minecraft-Hopper-Performance.patch
View File

@ -1,4 +1,4 @@
From 2e48e52f960cdd8ff85cb64cc0c50b7f44d4eff0 Mon Sep 17 00:00:00 2001 From 29b179f996972a2d90483d041631ac3146f24e17 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 27 Apr 2016 22:09:52 -0400 Date: Wed, 27 Apr 2016 22:09:52 -0400
Subject: [PATCH] Improve Minecraft Hopper Performance Subject: [PATCH] Improve Minecraft Hopper Performance
@ -28,10 +28,10 @@ index d0c0371..d2662ae 100644
this.g = iblockdata.getBlock().toLegacyData(iblockdata); this.g = iblockdata.getBlock().toLegacyData(iblockdata);
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index f12bc70..c21c63e 100644 index 6acce15..44b6ecc 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -216,11 +216,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -220,11 +220,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
this.setCooldown(world.spigotConfig.hopperTransfer); // Spigot this.setCooldown(world.spigotConfig.hopperTransfer); // Spigot
return false; return false;
} }
@ -49,7 +49,7 @@ index f12bc70..c21c63e 100644
iinventory.update(); iinventory.update();
} else { } else {
this.setItem(i, itemstack); this.setItem(i, itemstack);
@@ -373,11 +375,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -377,11 +379,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
} }
return false; return false;
} }
@ -67,7 +67,7 @@ index f12bc70..c21c63e 100644
iinventory.update(); iinventory.update();
} else { } else {
iinventory.setItem(i, itemstack1); iinventory.setItem(i, itemstack1);
@@ -455,7 +459,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -459,7 +463,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
boolean flag1 = iinventory1.w_(); boolean flag1 = iinventory1.w_();
if (itemstack1.isEmpty()) { if (itemstack1.isEmpty()) {
@ -77,7 +77,7 @@ index f12bc70..c21c63e 100644
itemstack = ItemStack.a; itemstack = ItemStack.a;
flag = true; flag = true;
} else if (a(itemstack1, itemstack)) { } else if (a(itemstack1, itemstack)) {
@@ -558,6 +564,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -562,6 +568,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
this.f = i; this.f = i;
} }

20
Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch
View File

@ -1,4 +1,4 @@
From 7926e2d31862d9611ebab6d4ea49ed229f39398b Mon Sep 17 00:00:00 2001 From 763620e8d8bd7e1c87242e6b8d6188efcdfa07d0 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Sat, 18 Jun 2016 01:01:37 -0500 Date: Sat, 18 Jun 2016 01:01:37 -0500
Subject: [PATCH] Make entities look for hoppers Subject: [PATCH] Make entities look for hoppers
@ -261,10 +261,10 @@ index 804215a..e830d83 100644
+ double G(); default double getZ() { return G(); } // Paper - OBFHELPER + double G(); default double getZ() { return G(); } // Paper - OBFHELPER
} }
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index c21c63e..eaf06dd 100644 index 44b6ecc..022e645 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -122,6 +122,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -126,6 +126,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
} }
private boolean o() { private boolean o() {
@ -272,7 +272,7 @@ index c21c63e..eaf06dd 100644
if (this.world != null && !this.world.isClientSide) { if (this.world != null && !this.world.isClientSide) {
if (!this.J() && BlockHopper.f(this.v())) { if (!this.J() && BlockHopper.f(this.v())) {
boolean flag = false; boolean flag = false;
@@ -131,6 +132,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -135,6 +136,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
} }
if (!this.r()) { if (!this.r()) {
@ -280,7 +280,7 @@ index c21c63e..eaf06dd 100644
flag = a((IHopper) this) || flag; flag = a((IHopper) this) || flag;
} }
@@ -146,6 +148,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -150,6 +152,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
} }
} }
@ -295,7 +295,7 @@ index c21c63e..eaf06dd 100644
private boolean p() { private boolean p() {
Iterator iterator = this.items.iterator(); Iterator iterator = this.items.iterator();
@@ -298,8 +308,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -302,8 +312,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
return true; return true;
} }
@ -312,7 +312,7 @@ index c21c63e..eaf06dd 100644
if (iinventory != null) { if (iinventory != null) {
EnumDirection enumdirection = EnumDirection.DOWN; EnumDirection enumdirection = EnumDirection.DOWN;
@@ -330,8 +347,8 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -334,8 +351,8 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
} }
} }
} }
@ -323,7 +323,7 @@ index c21c63e..eaf06dd 100644
while (iterator.hasNext()) { while (iterator.hasNext()) {
EntityItem entityitem = (EntityItem) iterator.next(); EntityItem entityitem = (EntityItem) iterator.next();
@@ -397,6 +414,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -401,6 +418,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
return false; return false;
} }
@ -331,7 +331,7 @@ index c21c63e..eaf06dd 100644
public static boolean a(IInventory iinventory, IInventory iinventory1, EntityItem entityitem) { public static boolean a(IInventory iinventory, IInventory iinventory1, EntityItem entityitem) {
boolean flag = false; boolean flag = false;
@@ -502,18 +520,44 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -506,18 +524,44 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
private IInventory I() { private IInventory I() {
EnumDirection enumdirection = BlockHopper.e(this.v()); EnumDirection enumdirection = BlockHopper.e(this.v());
@ -380,7 +380,7 @@ index c21c63e..eaf06dd 100644
Object object = null; Object object = null;
int i = MathHelper.floor(d0); int i = MathHelper.floor(d0);
int j = MathHelper.floor(d1); int j = MathHelper.floor(d1);
@@ -533,7 +577,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -537,7 +581,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
} }
} }

2
work/Bukkit

@ -1 +1 @@
Subproject commit 50702e72bc019590101e6c47b14b42db33de46a9 Subproject commit 1861013a8c070400d70d3b9703e1c9afcce0be80

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 3c48711c053bf7c007964f17135c56d6dfe1fda6 Subproject commit a552117725a316dbae014fb85e431e5264e631d4

2
work/Spigot

@ -1 +1 @@
Subproject commit b4417b8d188ae9d59bc9fc02bbc5b08690e40f64 Subproject commit 65a03470106fdceec943006e8b9b1cb3f5b89235