Update to Minecraft 1.11.1

1 files changed, 26 insertions, 26 deletions

diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch
index 508b23e5..3c7bd958 100644
--- a/nms-patches/EntityPlayer.patch
+++ b/nms-patches/EntityPlayer.patch
@@ -66,8 +66,8 @@
 +        this.getBukkitEntity().readExtraData(nbttagcompound); // CraftBukkit
      }
  
-     public void b(NBTTagCompound nbttagcompound) {
-@@ -102,8 +133,33 @@
+     public static void a(DataConverterManager dataconvertermanager) {
+@@ -119,8 +150,33 @@
              nbttagcompound1.set("Entity", nbttagcompound2);
              nbttagcompound.set("RootVehicle", nbttagcompound1);
          }
@@ -101,7 +101,7 @@
  
      public void levelDown(int i) {
          super.levelDown(i);
-@@ -134,6 +190,11 @@
+@@ -151,6 +207,11 @@
      }
  
      public void A_() {
@@ -113,7 +113,7 @@
          this.playerInteractManager.a();
          --this.invulnerableTicks;
          if (this.noDamageTicks > 0) {
-@@ -193,7 +254,7 @@
+@@ -210,7 +271,7 @@
              }
  
              if (this.getHealth() != this.lastHealthSent || this.cc != this.foodData.getFoodLevel() || this.foodData.getSaturationLevel() == 0.0F != this.cd) {
@@ -122,7 +122,7 @@
                  this.lastHealthSent = this.getHealth();
                  this.cc = this.foodData.getFoodLevel();
                  this.cd = this.foodData.getSaturationLevel() == 0.0F;
-@@ -214,6 +275,12 @@
+@@ -231,6 +292,12 @@
                  this.a(IScoreboardCriteria.i, MathHelper.f((float) this.bX));
              }
  
@@ -135,7 +135,7 @@
              if (this.getArmorStrength() != this.bY) {
                  this.bY = this.getArmorStrength();
                  this.a(IScoreboardCriteria.j, MathHelper.f((float) this.bY));
-@@ -238,6 +305,16 @@
+@@ -255,6 +322,16 @@
                  this.o();
              }
  
@@ -152,7 +152,7 @@
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Ticking player");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Player being ticked");
-@@ -248,12 +325,11 @@
+@@ -265,12 +342,11 @@
      }
  
      private void a(IScoreboardCriteria iscoreboardcriteria, int i) {
@@ -167,7 +167,7 @@
  
              scoreboardscore.setScore(i);
          }
-@@ -302,31 +378,61 @@
+@@ -319,31 +395,61 @@
          boolean flag = this.world.getGameRules().getBoolean("showDeathMessages");
  
          this.playerConnection.sendPacket(new PacketPlayOutCombatEvent(this.getCombatTracker(), PacketPlayOutCombatEvent.EnumCombatEventType.ENTITY_DIED, flag));
@@ -182,7 +182,7 @@
 +
 +        if (!keepInventory) {
 +            for (ItemStack item : this.inventory.getContents()) {
-+                if (!item.isEmpty() && !EnchantmentManager.c(item)) { // PAIL: shouldNotDrop (Vanishing enchant)
++                if (!item.isEmpty() && !EnchantmentManager.e(item)) { // PAIL: shouldNotDrop (Vanishing enchant)
 +                    loot.add(CraftItemStack.asCraftMirror(item));
 +                }
 +            }
@@ -243,7 +243,7 @@
  
              scoreboardscore.incrementScore();
          }
-@@ -385,13 +491,15 @@
+@@ -402,13 +508,15 @@
      }
  
      private boolean canPvP() {
@@ -261,7 +261,7 @@
              this.world.kill(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;
-@@ -412,7 +520,10 @@
+@@ -429,7 +537,10 @@
                  this.b((Statistic) AchievementList.y);
              }
  
@@ -273,7 +273,7 @@
              this.playerConnection.sendPacket(new PacketPlayOutWorldEvent(1032, BlockPosition.ZERO, 0, false));
              this.lastSentExp = -1;
              this.lastHealthSent = -1.0F;
-@@ -457,6 +568,7 @@
+@@ -474,6 +585,7 @@
      }
  
      public void a(boolean flag, boolean flag1, boolean flag2) {
@@ -281,7 +281,7 @@
          if (this.isSleeping()) {
              this.x().getTracker().sendPacketToEntity(this, new PacketPlayOutAnimation(this, 2));
          }
-@@ -535,23 +647,52 @@
+@@ -552,23 +664,52 @@
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
  
@@ -337,7 +337,7 @@
          if (iinventory instanceof ILootable && ((ILootable) iinventory).b() != null && this.isSpectator()) {
              this.a((new ChatMessage("container.spectatorCantOpen", new Object[0])).setChatModifier((new ChatModifier()).setColor(EnumChatFormat.RED)), true);
          } else {
-@@ -565,18 +706,21 @@
+@@ -582,18 +723,21 @@
                  if (itileinventory.isLocked() && !this.a(itileinventory.getLock()) && !this.isSpectator()) {
                      this.playerConnection.sendPacket(new PacketPlayOutChat(new ChatMessage("container.isLocked", new Object[] { iinventory.getScoreboardDisplayName()}), (byte) 2));
                      this.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.Y, SoundCategory.BLOCKS, this.locX, this.locY, this.locZ, 1.0F, 1.0F));
@@ -361,7 +361,7 @@
  
              this.activeContainer.windowId = this.containerCounter;
              this.activeContainer.addSlotListener(this);
-@@ -584,8 +728,14 @@
+@@ -601,8 +745,14 @@
      }
  
      public void openTrade(IMerchant imerchant) {
@@ -377,7 +377,7 @@
          this.activeContainer.windowId = this.containerCounter;
          this.activeContainer.addSlotListener(this);
          InventoryMerchant inventorymerchant = ((ContainerMerchant) this.activeContainer).e();
-@@ -605,13 +755,20 @@
+@@ -622,13 +772,20 @@
      }
  
      public void openHorseInventory(EntityHorseAbstract entityhorseabstract, IInventory iinventory) {
@@ -399,7 +399,7 @@
          this.activeContainer.windowId = this.containerCounter;
          this.activeContainer.addSlotListener(this);
      }
-@@ -648,6 +805,11 @@
+@@ -665,6 +822,11 @@
      public void a(Container container, NonNullList<ItemStack> nonnulllist) {
          this.playerConnection.sendPacket(new PacketPlayOutWindowItems(container.windowId, nonnulllist));
          this.playerConnection.sendPacket(new PacketPlayOutSetSlot(-1, -1, this.inventory.getCarried()));
@@ -411,7 +411,7 @@
      }
  
      public void setContainerData(Container container, int i, int j) {
-@@ -662,6 +824,7 @@
+@@ -679,6 +841,7 @@
      }
  
      public void closeInventory() {
@@ -419,7 +419,7 @@
          this.playerConnection.sendPacket(new PacketPlayOutCloseWindow(this.activeContainer.windowId));
          this.s();
      }
-@@ -743,7 +906,16 @@
+@@ -760,7 +923,16 @@
  
      public void triggerHealthUpdate() {
          this.lastHealthSent = -1.0E8F;
@@ -436,7 +436,7 @@
  
      public void a(IChatBaseComponent ichatbasecomponent, boolean flag) {
          this.playerConnection.sendPacket(new PacketPlayOutChat(ichatbasecomponent, (byte) (flag ? 2 : 0)));
-@@ -804,6 +976,8 @@
+@@ -821,6 +993,8 @@
      }
  
      public void a(EnumGamemode enumgamemode) {
@@ -445,7 +445,7 @@
          this.playerInteractManager.setGameMode(enumgamemode);
          this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, (float) enumgamemode.getId()));
          if (enumgamemode == EnumGamemode.SPECTATOR) {
-@@ -814,6 +988,7 @@
+@@ -831,6 +1005,7 @@
  
          this.updateAbilities();
          this.cw();
@@ -453,7 +453,7 @@
      }
  
      public boolean isSpectator() {
-@@ -829,6 +1004,7 @@
+@@ -846,6 +1021,7 @@
      }
  
      public boolean a(int i, String s) {
@@ -461,7 +461,7 @@
          if ("seed".equals(s) && !this.server.aa()) {
              return true;
          } else if (!"tell".equals(s) && !"help".equals(s) && !"me".equals(s) && !"trigger".equals(s)) {
-@@ -842,6 +1018,15 @@
+@@ -859,6 +1035,15 @@
          } else {
              return true;
          }
@@ -477,7 +477,7 @@
      }
  
      public String A() {
-@@ -853,6 +1038,12 @@
+@@ -870,6 +1055,12 @@
      }
  
      public void a(PacketPlayInSettings packetplayinsettings) {
@@ -490,7 +490,7 @@
          this.locale = packetplayinsettings.a();
          this.cg = packetplayinsettings.c();
          this.ch = packetplayinsettings.d();
-@@ -941,7 +1132,7 @@
+@@ -958,7 +1149,7 @@
  
      @Nullable
      public IChatBaseComponent getPlayerListName() {
@@ -499,7 +499,7 @@
      }
  
      public void a(EnumHand enumhand) {
-@@ -958,11 +1149,150 @@
+@@ -975,11 +1166,150 @@
      }
  
      public void M() {