Update upstream B/CB

PaperMC · Jul 31, 2018 · 96ce4bd · 96ce4bd
1 parent cae5a06
commit 96ce4bd
Show file tree

Hide file tree

Showing 28 changed files with 191 additions and 191 deletions.
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 316df958ca5c55a2535278f3d212b045aa149d88 Mon Sep 17 00:00:00 2001
+From 0a99f65b3af82daaf174c4c389994abaf8acffac Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -519,10 +519,10 @@ index 5ff1e9686..3706e44a3 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 34d6ad182..b8eb89240 100644
+index 55bf00be9..a1050912b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -134,9 +134,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      private static final DataWatcherObject<Boolean> aG = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aH = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      public boolean inChunk;
@@ -696,5 +696,5 @@ index 9128f7754..7b1a9a8a0 100644
          config.addDefault( "world-settings.default." + path, def );
          return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@@ -1,12 +1,12 @@
-From 04982f8161c4fa45ebd2115b734a9f72cd35790c Mon Sep 17 00:00:00 2001
+From 4bffc6c4381b8f560de9b87dae45060fa43bf997 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 01:40:13 -0400
 Subject: [PATCH] Add MinecraftKey Information to Objects
 
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index e8f7b7292d..7ff8e70b24 100644
+index e8f7b7292..7ff8e70b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -171,7 +171,7 @@ public class PaperCommand extends Command {
@@ -19,10 +19,10 @@ index e8f7b7292d..7ff8e70b24 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ef21637c44..5faaf3b199 100644
+index a1050912b..7e691baf9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -45,7 +45,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
+@@ -46,7 +46,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
  import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
 
@@ -31,7 +31,7 @@ index ef21637c44..5faaf3b199 100644
 
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -73,7 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -74,7 +74,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static double c = 1.0D;
      private static int entityCount;
@@ -40,7 +40,7 @@ index ef21637c44..5faaf3b199 100644
      private int id;
      public boolean j;
      public final List<Entity> passengers;
-@@ -1762,12 +1762,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1763,12 +1763,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
 
@@ -75,7 +75,7 @@ index ef21637c44..5faaf3b199 100644
 
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 9a513b4e3a..fa268f3543 100644
+index 9a513b4e3..fa268f354 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -238,6 +238,7 @@ public class EntityTypes<T extends Entity> {
@@ -88,7 +88,7 @@ index 9a513b4e3a..fa268f3543 100644
      }
 diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
 new file mode 100644
-index 0000000000..743142d030
+index 000000000..743142d03
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +1,9 @@
@@ -102,7 +102,7 @@ index 0000000000..743142d030
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8a0453245d..5ca7fef518 100644
+index 8a0453245..5ca7fef51 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -7,11 +7,11 @@ import org.apache.logging.log4j.Logger;
@@ -147,5 +147,5 @@ index 8a0453245d..5ca7fef518 100644
      public World getWorld() {
          return this.world;
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From bda9bfa66f13a5452e94d471c406ea177822827e Mon Sep 17 00:00:00 2001
+From 9194ef5bb3a3499c930324ad6b4451399c8d84fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2d06202da7..8d9aa271a1 100644
+index 2d06202da..8d9aa271a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess {
@@ -94,10 +94,10 @@ index 2d06202da7..8d9aa271a1 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5faaf3b199..8934ff699b 100644
+index 7e691baf9..19109ee1d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -133,7 +133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private static final DataWatcherObject<Boolean> aF = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aG = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aH = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
@@ -106,7 +106,7 @@ index 5faaf3b199..8934ff699b 100644
      public int ae; public int getChunkX() { return ae; } // Paper - OBFHELPER
      public int af; public int getChunkY() { return af; } // Paper - OBFHELPER
      public int ag; public int getChunkZ() { return ag; } // Paper - OBFHELPER
-@@ -1763,6 +1763,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1764,6 +1764,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
 
      // Paper start
@@ -147,7 +147,7 @@ index 5faaf3b199..8934ff699b 100644
      private String entityKeyString;
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 5ca7fef518..9361667c3b 100644
+index 5ca7fef51..9361667c3 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -167,7 +167,7 @@ index 5ca7fef518..9361667c3b 100644
 
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b542b17fd0..9fc7ac8c02 100644
+index b542b17fd..9fc7ac8c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -9,6 +9,7 @@ import java.util.UUID;
@@ -192,5 +192,5 @@ index b542b17fd0..9fc7ac8c02 100644
          /**
           * Order is *EXTREMELY* important -- keep it right! =D
 -- 
-2.18.0
+2.17.1