SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.12.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-09-18 20:00:00 +10:00
parent 65ab757f26
commit 5e3ba4ff73
23 changed files with 120 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
View File

@@ -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();

14
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
View File

@@ -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;
}
}