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

Apply the Ensure inv drag is in bounds patch properly

Browse Source 
Closes GH-174
This commit is contained in:
Zach Brown 2016-04-09 21:33:29 -05:00
parent 38b8a26236
commit 6fc0a013a5
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/0068-Ensure-inv-drag-is-in-bounds.patch
View File

@ -1,22 +1,22 @@
From b2f9be4f53440860fd75b41484b8347f5e23d231 Mon Sep 17 00:00:00 2001 From f17a8ae4a73cef2e4c35c92919eff663938aac22 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:33:53 -0600 Date: Thu, 3 Mar 2016 02:33:53 -0600
Subject: [PATCH] Ensure inv drag is in bounds Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
index 000b4db..e72eac4 100644 index 000b4db..3114027 100644
--- a/src/main/java/net/minecraft/server/Container.java --- a/src/main/java/net/minecraft/server/Container.java
+++ b/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java
@@ -110,7 +110,7 @@ public abstract class Container { @@ -138,7 +138,7 @@ public abstract class Container {
} this.d();
}
} else if (this.g == 1) {
- Slot slot = (Slot) this.c.get(i);
+ Slot slot = i < this.c.size() ? this.c.get(i) : null; // Paper - Ensure drag in bounds
public ItemStack b(EntityHuman entityhuman, int i) { if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
- Slot slot = (Slot) this.c.get(i); this.h.add(slot);
+ Slot slot = i < this.c.size() ? this.c.get(i) : null; // Paper - Ensure drag in bounds
return slot != null ? slot.getItem() : null;
}
-- --
2.8.0 2.8.0