b170e8cedb
Remove two features added upstream
22 lines
1,012 B
Diff
22 lines
1,012 B
Diff
From 95706d529b7c7d6d68f3c5d9ab39b8c00db8febe Mon Sep 17 00:00:00 2001
|
|
From: Joseph Hirschfeld <joe@ibj.io>
|
|
Date: Thu, 3 Mar 2016 02:33:53 -0600
|
|
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
|
|
index 02b1fb1..d39ffbe 100644
|
|
--- a/src/main/java/net/minecraft/server/Container.java
|
|
+++ b/src/main/java/net/minecraft/server/Container.java
|
|
@@ -142,7 +142,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
|
|
|
|
if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
|
|
this.h.add(slot);
|
|
--
|
|
2.9.2.windows.1
|
|
|