summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-09-18 20:00:00 +1000
committermd_5 <git@md-5.net>2017-09-18 20:00:00 +1000
commit9a1f5ee80a8665b0c388758003e2bda1ee924084 (patch)
treeb97318e90572fbf8190689d2233eac672d888f70 /src/main
parent8f472147b7f78ccd565bc97a125030f92fdf732d (diff)
downloadcraftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar
craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar.gz
craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar.lz
craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar.xz
craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.zip
Update to Minecraft 1.12.2
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/Main.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index f4e1ca79..4467eee9 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -169,7 +169,7 @@ public class Main {
useConsole = false;
}
- if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+ if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor());
Calendar deadline = Calendar.getInstance();
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index 7ce7d600..97a5143f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -93,8 +93,8 @@ public class CraftContainer extends Container {
String type = getNotchInventoryType(cachedType);
IInventory top = ((CraftInventory) view.getTopInventory()).getInventory();
PlayerInventory bottom = (PlayerInventory) ((CraftInventory) view.getBottomInventory()).getInventory();
- this.b.clear();
- this.c.clear();
+ this.items.clear();
+ this.slots.clear();
if (typeChanged) {
setupSlots(top, bottom, player.getHandle());
}
@@ -172,18 +172,18 @@ public class CraftContainer extends Container {
}
if (delegate != null) {
- this.b = delegate.b; // PAIL: items
- this.c = delegate.c; // PAIL: slots
+ this.items = delegate.items;
+ this.slots = delegate.slots;
}
}
@Override
- public ItemStack b(EntityHuman entityhuman, int i) { // PAIL: shiftClick
- return (delegate != null) ? delegate.b(entityhuman, i) : super.b(entityhuman, i);
+ public ItemStack shiftClick(EntityHuman entityhuman, int i) {
+ return (delegate != null) ? delegate.shiftClick(entityhuman, i) : super.shiftClick(entityhuman, i);
}
@Override
- public boolean a(EntityHuman entity) { // PAIL: canUse
+ public boolean canUse(EntityHuman entity) {
return true;
}
}