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

Upstream update

Browse Source
This commit is contained in:
Aikar 2016-12-27 13:07:43 -05:00
parent d8b42d5a7a
commit 64f6edc759
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0158-Fix-AIOOBE-in-inventory-handling.patch
View File

@ -1,14 +1,14 @@
From 4ab54d15d2b56c57ade5c0211e7302e3aa0f1da3 Mon Sep 17 00:00:00 2001 From 7bd73694bd50e01b3ac88d7b06a8c68006e128f8 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de> From: Brokkonaut <hannos17@gmx.de>
Date: Sun, 4 Sep 2016 16:35:43 -0500 Date: Sun, 4 Sep 2016 16:35:43 -0500
Subject: [PATCH] Fix AIOOBE in inventory handling Subject: [PATCH] Fix AIOOBE in inventory handling
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 216f9d0..b8b7142 100644 index 91364b5b5..4ca942927 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1805,7 +1805,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -1800,7 +1800,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
case CLONE: case CLONE:
if (packetplayinwindowclick.c() == 2) { if (packetplayinwindowclick.c() == 2) {
click = ClickType.MIDDLE; click = ClickType.MIDDLE;
@ -18,5 +18,5 @@ index 216f9d0..b8b7142 100644
} else { } else {
Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b()); Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
-- --
2.9.3 2.11.0

14
Spigot-Server-Patches/0192-IllegalPacketEvent.patch
View File

@ -1,4 +1,4 @@
From af7039820f33212e53e66eae30be55733bdb8197 Mon Sep 17 00:00:00 2001 From 48419d71659c040e99db74fb0ffc03dc5346da2c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 23 Jun 2016 23:33:57 -0400 Date: Thu, 23 Jun 2016 23:33:57 -0400
Subject: [PATCH] IllegalPacketEvent Subject: [PATCH] IllegalPacketEvent
@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
Fired for invalid data from players that represents hacking attempts Fired for invalid data from players that represents hacking attempts
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c57ab1a9c..06f85c46f 100644 index f57dff6c6..441f761b9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -17,7 +17,7 @@ index c57ab1a9c..06f85c46f 100644
import co.aikar.timings.MinecraftTimings; // Paper import co.aikar.timings.MinecraftTimings; // Paper
// CraftBukkit end // CraftBukkit end
@@ -2225,8 +2226,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2220,8 +2221,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
} }
} catch (Exception exception) { } catch (Exception exception) {
@ -27,7 +27,7 @@ index c57ab1a9c..06f85c46f 100644
} }
} else { } else {
String s1; String s1;
@@ -2268,8 +2268,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2263,8 +2263,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
} }
} catch (Exception exception1) { } catch (Exception exception1) {
@ -37,7 +37,7 @@ index c57ab1a9c..06f85c46f 100644
} }
} else if ("MC|TrSel".equals(s)) { } else if ("MC|TrSel".equals(s)) {
try { try {
@@ -2280,8 +2279,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2275,8 +2274,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
((ContainerMerchant) container).d(j); ((ContainerMerchant) container).d(j);
} }
} catch (Exception exception2) { } catch (Exception exception2) {
@ -47,7 +47,7 @@ index c57ab1a9c..06f85c46f 100644
} }
} else { } else {
TileEntity tileentity; TileEntity tileentity;
@@ -2422,8 +2420,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2417,8 +2415,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
iinventory.update(); iinventory.update();
} }
} catch (Exception exception5) { } catch (Exception exception5) {
@ -57,7 +57,7 @@ index c57ab1a9c..06f85c46f 100644
} }
} }
} else if ("MC|ItemName".equals(s)) { } else if ("MC|ItemName".equals(s)) {
@@ -2522,7 +2519,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2517,7 +2514,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k))); this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k)));
this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
} catch (Exception exception7) { } catch (Exception exception7) {

10
Spigot-Server-Patches/0193-Properly-fix-item-duplication-bug.patch
View File

@ -1,4 +1,4 @@
From 5aa3d868dd87e2a3ec404944b7f0c01b5320836f Mon Sep 17 00:00:00 2001 From b078c9b21409986a6ee694001bafa9baf17a7212 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com> From: Alfie Cleveland <alfeh@me.com>
Date: Tue, 27 Dec 2016 01:57:57 +0000 Date: Tue, 27 Dec 2016 01:57:57 +0000
Subject: [PATCH] Properly fix item duplication bug Subject: [PATCH] Properly fix item duplication bug
@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
Credit to prplz for figuring out the real issue Credit to prplz for figuring out the real issue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 523d916..60219f9 100644 index 523d91675..60219f97c 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1328,7 +1328,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1328,7 +1328,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -19,10 +19,10 @@ index 523d916..60219f9 100644
public void reset() { public void reset() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 167ccbe..89a0752 100644 index 441f761b9..9f721d88c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2547,6 +2547,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -2542,6 +2542,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start - Add "isDisconnected" method // CraftBukkit start - Add "isDisconnected" method
public final boolean isDisconnected() { public final boolean isDisconnected() {
@ -31,5 +31,5 @@ index 167ccbe..89a0752 100644
} }
} }
-- --
2.9.3 (Apple Git-75) 2.11.0

2
work/Bukkit

@ -1 +1 @@
Subproject commit 9cf6b3cfa6186a0214b7b7d3b47770f2eae6a25d Subproject commit b2f4716e05e089f5b85ab3ac5d0eca124120bcbe

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 50acb4477d0f73a668d58fe0b5a8e69e2665094a Subproject commit f9e044059f493363621a6feb931c17eb9f5e1904