Update CB/S

2018-03-08 19:36:35 +00:00 · 2018-03-08 19:36:35 +00:00 · cdc1dcf02e
Commit cdc1dcf02e
--- a/Spigot-Server-Patches/0028-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0028-Configurable-end-credits.patch
@ -1,11 +1,11 @@
-From 0d4cacaffc984e789135355f9b2f7eac2983f7af Mon Sep 17 00:00:00 2001
+From ccaca422e71692a8b2741a2df5f4859a90716c11 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 94a17304..db09711e 100644
+index 94a173045..db09711e4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -141,4 +141,10 @@ public class PaperWorldConfig {
@ -20,7 +20,7 @@ index 94a17304..db09711e 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4e71963b..9829cdd8 100644
+index 730acd971..dfaab774d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -56,7 +56,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -32,7 +32,7 @@ index 4e71963b..9829cdd8 100644
     private final RecipeBookServer cr = new RecipeBookServer();
     private Vec3D cs;
     private int ct;
-@@ -603,6 +603,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -612,6 +612,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             this.world.kill(this);
             if (!this.viewingCredits) {
                 this.viewingCredits = true;
@ -41,5 +41,5 @@ index 4e71963b..9829cdd8 100644
                 this.cq = true;
             }
 -- 
-2.14.3
+2.16.2

--- a/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
@ -1,4 +1,4 @@
-From c8862c15d9b67e0ab06bf16bed2becb5bee083f3 Mon Sep 17 00:00:00 2001
+From 077ede472069273293c0cc7ddbc3416b7888849b Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@ -19,7 +19,7 @@ index f431000d1..abcfb9216 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5b0675718..e48121b4a 100644
+index 3058dfef0..ed3546ccc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -30,7 +30,7 @@ index 5b0675718..e48121b4a 100644
 
     // CraftBukkit start
     public String displayName;
-@@ -266,7 +267,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -275,7 +276,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             --this.noDamageTicks;
         }
 
@ -45,5 +45,5 @@ index 5b0675718..e48121b4a 100644
             this.closeInventory();
             this.activeContainer = this.defaultContainer;
 -- 
-2.14.3
+2.16.2

--- a/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch
@ -1,11 +1,11 @@
-From 3034ff4282f30c45b816c24e5764671fca4ab37a Mon Sep 17 00:00:00 2001
+From 2b9856956c8f5819c2abbbe0f11a9104896b4400 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e48121b4a..24d3b29a5 100644
+index ed3546ccc..4b6976b19 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@ -17,7 +17,7 @@ index e48121b4a..24d3b29a5 100644
     public PlayerConnection playerConnection;
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
-@@ -1229,12 +1229,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1238,12 +1238,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
             this.server.server.getPluginManager().callEvent(event);
         }
@ -71,5 +71,5 @@ index 0eee46edd..98e9da59a 100644
 
         @Override
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch
@ -1,14 +1,14 @@
-From 96c2dfd042ce83b16d21bdc757b4665add7f2093 Mon Sep 17 00:00:00 2001
+From 2eb7b75f8bb6dc310bad7d8c8d8113eba19f1eef Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 24d3b29a5..b937b6d0d 100644
+index 4b6976b19..2391adac7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -715,6 +715,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -724,6 +724,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         if (entity1 != entity && this.playerConnection != null) {
             this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
         }
@ -23,5 +23,5 @@ index 24d3b29a5..b937b6d0d 100644
     }
 
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch
@ -1,4 +1,4 @@
-From 61467bc3f9eb5227fef75f1a2699fa40e6e8457a Mon Sep 17 00:00:00 2001
+From fa08f539cc0615f258c70c4b690093d51d2fa249 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ef081a57f..456180178 100644
+index 8b7eb47a2..7886eee61 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -131,6 +131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -140,6 +140,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     public void a(NBTTagCompound nbttagcompound) {
         super.a(nbttagcompound);
@ -18,5 +18,5 @@ index ef081a57f..456180178 100644
             if (this.C_().getForceGamemode()) {
                 this.playerInteractManager.setGameMode(this.C_().getGamemode());
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch
@ -1,4 +1,4 @@
-From 664ca0963760c29d828da4ac8f405e02f43c27b0 Mon Sep 17 00:00:00 2001
+From 655aba7ed51731aa844e58fe6358c513c2260f92 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@ -22,10 +22,10 @@ index 94d011721..fcf99e668 100644
             if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                 return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index fe137ed06..09b466fcb 100644
+index 2795447b5..2c90112bc 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -622,6 +622,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
+@@ -630,6 +630,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
         if (!this.world.isClientSide && !this.dead) {
             EntityWitch entitywitch = new EntityWitch(this.world);
 
@ -38,7 +38,7 @@ index fe137ed06..09b466fcb 100644
             entitywitch.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
             entitywitch.prepare(this.world.D(new BlockPosition(entitywitch)), (GroupDataEntity) null);
             entitywitch.setNoAI(this.isNoAI());
-@@ -630,7 +636,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
+@@ -638,7 +644,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
                 entitywitch.setCustomNameVisible(this.getCustomNameVisible());
             }
 
@ -67,5 +67,5 @@ index bc84dd30f..ba7e5d181 100644
         HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
         horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0167-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0167-Optimise-removeQueue.patch
@ -1,11 +1,11 @@
-From b2f598d188251fd4eb758669256903c8178f4235 Mon Sep 17 00:00:00 2001
+From d5b5ce5c7d017213e228a001c11275ad58ca2fa7 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 456180178..87967b687 100644
+index 7886eee61..f8e289475 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -3,8 +3,10 @@ package net.minecraft.server;
@ -28,7 +28,7 @@ index 456180178..87967b687 100644
     private final AdvancementDataPlayer bY;
     private final ServerStatisticManager bZ;
     private float ca = Float.MIN_VALUE;
-@@ -286,10 +288,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -295,10 +297,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             Iterator iterator = this.removeQueue.iterator();
             int j = 0;
 
@ -47,7 +47,7 @@ index 456180178..87967b687 100644
 
             this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
         }
-@@ -1103,7 +1112,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1112,7 +1121,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.lastHealthSent = -1.0F;
         this.ch = -1;
         // this.cr.a((RecipeBook) entityplayer.cr); // CraftBukkit
@ -61,5 +61,5 @@ index 456180178..87967b687 100644
         this.cv = entityplayer.cv;
         this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
@ -1,4 +1,4 @@
-From 960bf7841f506ecc2d545186199d23b6852ee8db Mon Sep 17 00:00:00 2001
+From 889bedc0448d24b11920cd3a265ea4e9219337d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -28,10 +28,10 @@ index 513c4b020..631aa6eb9 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 09b466fcb..df009e190 100644
+index 2c90112bc..22e3e05ac 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -767,7 +767,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
+@@ -775,7 +775,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
         public void a(IMerchant imerchant, MerchantRecipeList merchantrecipelist, Random random) {
             int i = this.a.a(random);
             World world = imerchant.u_();
@ -42,5 +42,5 @@ index 09b466fcb..df009e190 100644
             if (blockposition != null) {
                 ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch
@ -1,4 +1,4 @@
-From 7271052824771f13c3f2d1af7dbf9fd6feb49aeb Mon Sep 17 00:00:00 2001
+From 8581be0d94656eec014608e0149b2a7766c61ea3 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 87967b687..0b71c4b90 100644
+index f8e289475..cce3f98da 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1500,7 +1500,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     @Override
     protected boolean isFrozen() {
@ -19,7 +19,7 @@ index 87967b687..0b71c4b90 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 45a50602b..33ae76415 100644
+index 40ab98f07..4f8865d61 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2632,6 +2632,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -31,5 +31,5 @@ index 45a50602b..33ae76415 100644
     }
 }
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From fa7ee18f3ed2680a98723a562bc7c6bf8f8c6efc Mon Sep 17 00:00:00 2001
+From 3669e2037cee20bec34be974cbf46c9b02702cfd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -156,10 +156,10 @@ index 0255986fd..e14f614f5 100644
 
             this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index df009e190..9944e0f91 100644
+index 22e3e05ac..cad3465ed 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -421,7 +421,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
+@@ -429,7 +429,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
         }
 
         if (merchantrecipe.j()) {
@ -253,5 +253,5 @@ index 3a09cab3d..3302af0e4 100644
     public EntityExperienceOrb getHandle() {
         return (EntityExperienceOrb) entity;
 -- 
-2.16.1
+2.16.2

--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 3a482bdd40088d78a838a16ed7c9064342aa8acd
+Subproject commit 7e94e65a1ca93e86dbc2eed3cca77c8a9ed8c102
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit 4bd94dc87d622db89bd58f414ffa479348775e88
+Subproject commit c3093efafc5eab1ea62a8a57aa47f28f5ea85d03