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

Update to Minecraft 1.8.6

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-05-25 22:04:32 +10:00
parent 6c1c28bd14
commit d1875d1941
8 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/nms-patches/PlayerConnection.patch
View File

@@ -1263,7 +1263,7 @@
if (ItemStack.matches(packetplayinwindowclick.e(), itemstack)) {
this.player.playerConnection.sendPacket(new PacketPlayOutTransaction(packetplayinwindowclick.a(), packetplayinwindowclick.d(), true));
@@ -809,8 +1671,48 @@
@@ -797,8 +1659,48 @@
}
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
@@ -1313,7 +1313,7 @@
if (flag1 && flag2 && flag3) {
if (itemstack == null) {
@@ -833,6 +1735,7 @@
@@ -821,6 +1723,7 @@
}
public void a(PacketPlayInTransaction packetplayintransaction) {
@@ -1321,7 +1321,7 @@
PlayerConnectionUtils.ensureMainThread(packetplayintransaction, this, this.player.u());
Short oshort = (Short) this.n.get(this.player.activeContainer.windowId);
@@ -843,6 +1746,7 @@
@@ -831,6 +1734,7 @@
}
public void a(PacketPlayInUpdateSign packetplayinupdatesign) {
@@ -1329,7 +1329,7 @@
PlayerConnectionUtils.ensureMainThread(packetplayinupdatesign, this, this.player.u());
this.player.resetIdleTimer();
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
@@ -859,14 +1763,29 @@
@@ -847,14 +1751,29 @@
if (!tileentitysign.b() || tileentitysign.c() != this.player) {
this.minecraftServer.warning("Player " + this.player.getName() + " just tried to change non-editable sign");
@@ -1360,7 +1360,7 @@
tileentitysign.update();
worldserver.notify(blockposition);
@@ -889,11 +1808,27 @@
@@ -877,11 +1796,27 @@
public void a(PacketPlayInAbilities packetplayinabilities) {
PlayerConnectionUtils.ensureMainThread(packetplayinabilities, this, this.player.u());
@@ -1389,7 +1389,7 @@
ArrayList arraylist = Lists.newArrayList();
Iterator iterator = this.minecraftServer.tabCompleteCommand(this.player, packetplayintabcomplete.a(), packetplayintabcomplete.b()).iterator();
@@ -933,13 +1868,16 @@
@@ -921,13 +1856,16 @@
itemstack1 = this.player.inventory.getItemInHand();
if (itemstack1 != null) {
if (itemstack.getItem() == Items.WRITABLE_BOOK && itemstack.getItem() == itemstack1.getItem()) {
@@ -1406,7 +1406,7 @@
return;
} finally {
packetdataserializer.release();
@@ -962,16 +1900,21 @@
@@ -950,16 +1888,21 @@
itemstack1 = this.player.inventory.getItemInHand();
if (itemstack1 != null) {
if (itemstack.getItem() == Items.WRITTEN_BOOK && itemstack1.getItem() == Items.WRITABLE_BOOK) {
@@ -1428,7 +1428,7 @@
return;
} finally {
packetdataserializer.release();
@@ -988,11 +1931,12 @@
@@ -976,11 +1919,12 @@
}
} catch (Exception exception2) {
PlayerConnection.c.error("Couldn\'t select trade", exception2);
@@ -1442,7 +1442,7 @@
packetdataserializer = packetplayincustompayload.b();
try {
@@ -1028,6 +1972,7 @@
@@ -1016,6 +1960,7 @@
}
} catch (Exception exception3) {
PlayerConnection.c.error("Couldn\'t set command block", exception3);
@@ -1450,7 +1450,7 @@
} finally {
packetdataserializer.release();
}
@@ -1053,6 +1998,7 @@
@@ -1041,6 +1986,7 @@
}
} catch (Exception exception4) {
PlayerConnection.c.error("Couldn\'t set beacon", exception4);
@@ -1458,7 +1458,7 @@
}
}
} else if ("MC|ItemName".equals(packetplayincustompayload.a()) && this.player.activeContainer instanceof ContainerAnvil) {
@@ -1068,7 +2014,28 @@
@@ -1056,7 +2002,28 @@
containeranvil.a("");
}
}