Update Paper

613bdc3f9 [Auto] Updated Upstream (Bukkit/CraftBukkit) d35903e6f [CI-SKIP] Update README.md (1.16.3 release) (#4321) e6faa36eb Cache DataFixerUpper Rewrite Rules on demand a0b8b886c Updated Upstream (CraftBukkit/Spigot) (#4318) fb71c71c8 Restore thread pool names for Bootstrap vs main 5b352d9b3 [Auto] Updated Upstream (Bukkit/CraftBukkit) 7d85344ef (1.16.3) Missed some fixes to include in commit 64ed42988 (FIRST 1.16.3): Update Paper to 1.16.3 fa9c5e0f9 (FINAL 1.16.2) Improve Entity Activation Range passenger behavior 6fda3fd0e (FINAL 1.16.2) Improve Timings support for Active vs Inactive vs Passengers 794e6baf1 Add additional open container api to HumanEntity 44e822f7c Fix block data exception when cancelling PortalCreateEvent (#4199) 54890033d [Auto] Updated Upstream (CraftBukkit) f96c6f5c9 [Auto] Updated Upstream (CraftBukkit)
Minebench · Sep 15, 2020 · 6c89f23 · 6c89f23
1 parent 3080db6
commit 6c89f23
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 40 deletions.
diff --git a/Paper b/Paper
diff --git a/current-paper b/current-paper
@@ -1 +1 @@
-1.16.2--b6359330e9bae37ad29dd1fe7aff49368bd273c4
+1.16.3--2c6da9078a6d9ad9d1feff5f373f3afe5d7d0293
diff --git a/patches/api/0001-Origami-POM-Changes.patch b/patches/api/0001-Origami-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 20d39660e32cddcbcb779b745187387edf914d13 Mon Sep 17 00:00:00 2001
+From dc31a96b39b381d65b9061fd3d6893d2c1000075 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 24 Nov 2019 22:08:36 +0100
 Subject: [PATCH] Origami POM Changes
@@ -8,7 +8,7 @@ Subject: [PATCH] Origami POM Changes
  1 file changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 1a34f6880..3f2774a83 100644
+index 29dafd4b9..04f219e7a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,19 +3,18 @@
@@ -25,7 +25,7 @@ index 1a34f6880..3f2774a83 100644
 -    <groupId>com.destroystokyo.paper</groupId>
 -    <artifactId>paper-api</artifactId>
 +    <artifactId>origami-api</artifactId>
-     <version>1.16.2-R0.1-SNAPSHOT</version>
+     <version>1.16.3-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
 
 -    <name>Paper-API</name>

diff --git a/patches/mojangapi/0001-Origami-POM-changes.patch b/patches/mojangapi/0001-Origami-POM-changes.patch
@@ -1,4 +1,4 @@
-From 0c6be4d57db3a1056be4b0e4eb7b5dd7150c84cb Mon Sep 17 00:00:00 2001
+From 30a09d67f59483367d5e13611bb8377850915b59 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 5 May 2020 00:58:28 +0100
 Subject: [PATCH] Origami POM changes
@@ -8,7 +8,7 @@ Subject: [PATCH] Origami POM changes
  1 file changed, 7 insertions(+), 8 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 03a17db..7b3af87 100644
+index 0ac10a3..1fc6f03 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,17 @@
@@ -25,7 +25,7 @@ index 03a17db..7b3af87 100644
 -    <groupId>com.destroystokyo.paper</groupId>
 -    <artifactId>paper-mojangapi</artifactId>
 +    <artifactId>origami-mojangapi</artifactId>
-     <version>1.16.2-R0.1-SNAPSHOT</version>
+     <version>1.16.3-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
 
 -    <name>Paper-MojangAPI</name>

diff --git a/patches/server/0001-Origami-POM-Changes.patch b/patches/server/0001-Origami-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 4e937d0f356bd150d4cdfea226520cc1d0a29aa8 Mon Sep 17 00:00:00 2001
+From a21873b10eacd3b1f00de58575f316c60f80a5fa Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 24 Nov 2019 22:08:35 +0100
 Subject: [PATCH] Origami POM Changes
@@ -9,7 +9,7 @@ Subject: [PATCH] Origami POM Changes
  2 files changed, 53 insertions(+), 12 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 594ab9afbd..a2b99b5452 100644
+index add3a9c1a9..599290ca91 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -19,7 +19,7 @@ index 594ab9afbd..a2b99b5452 100644
 -    <artifactId>paper</artifactId>
 +    <artifactId>origami</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.2-R0.1-SNAPSHOT</version>
+     <version>1.16.3-R0.1-SNAPSHOT</version>
 -    <name>Paper</name>
 -    <url>https://papermc.io</url>
 +    <name>Origami-Server</name>
@@ -60,7 +60,7 @@ index 594ab9afbd..a2b99b5452 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -164,7 +165,7 @@
+@@ -165,7 +166,7 @@
 
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -69,7 +69,7 @@ index 594ab9afbd..a2b99b5452 100644
          <defaultGoal>clean install</defaultGoal> <!-- Paper -->
          <plugins>
              <plugin>
-@@ -172,7 +173,7 @@
+@@ -173,7 +174,7 @@
                  <artifactId>gitdescribe-maven-plugin</artifactId>
                  <version>1.3</version>
                  <configuration>
@@ -78,7 +78,7 @@ index 594ab9afbd..a2b99b5452 100644
                      <scmDirectory>..</scmDirectory>
                  </configuration>
                  <executions>
-@@ -414,5 +415,45 @@
+@@ -415,5 +416,45 @@
                  </plugins>
              </build>
          </profile>

diff --git a/patches/server/0002-Brand-changes.patch b/patches/server/0002-Brand-changes.patch
@@ -1,4 +1,4 @@
-From 442bb00a20951c671176bcbd15cc6fb723fce845 Mon Sep 17 00:00:00 2001
+From b847e6f252f8c351f8e069ff844820657d9070be Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 24 Nov 2019 22:28:42 +0100
 Subject: [PATCH] Brand changes
@@ -47,7 +47,7 @@ index 550232cb38..a551d9eead 100644
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bbe793ca36..92e4955cac 100644
+index 883c17f00b..9ad8b8f2fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1451,7 +1451,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -60,10 +60,10 @@ index bbe793ca36..92e4955cac 100644
 
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5f5b39b3b7..16de617cb5 100644
+index d8d29d1455..00f0de36ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
+@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -73,7 +73,7 @@ index 5f5b39b3b7..16de617cb5 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bac292e6d8..ba4c9c1b0e 100644
+index 9118f05424..96b98f2572 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -252,7 +252,7 @@ public class Main {

diff --git a/patches/server/0003-Check-Origami-repo-for-updates.patch b/patches/server/0003-Check-Origami-repo-for-updates.patch
@@ -1,4 +1,4 @@
-From 49cf9cc251e0d25d79a266f9226368cac7e770ee Mon Sep 17 00:00:00 2001
+From 171fb55bba751a9785247fd9e812a12091c79808 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 24 Nov 2019 22:31:18 +0100
 Subject: [PATCH] Check Origami repo for updates
@@ -74,10 +74,10 @@ index 0000000000..6cd58564a6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a9728c6c53..b9e8845251 100644
+index 0b2bc20d10..499e7f3afe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -327,7 +327,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -347,7 +347,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

diff --git a/patches/server/0004-Origami-Server-Config.patch b/patches/server/0004-Origami-Server-Config.patch
@@ -1,4 +1,4 @@
-From 4ab9aa5017c628932d662a9f4ea29d9bde6e22b4 Mon Sep 17 00:00:00 2001
+From 0c866e14e3974b27a16c30a8a9f03d420d5e3e51 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 24 Nov 2019 22:41:38 +0100
 Subject: [PATCH] Origami Server Config
@@ -136,7 +136,7 @@ index 0000000000..fe7330fabe
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 287db5203f..7bf69460cd 100644
+index eaa2853934..1166526b83 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -157,18 +157,18 @@ index 287db5203f..7bf69460cd 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16de617cb5..e093cd26f8 100644
+index 00f0de36ec..e825969880 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -854,6 +854,7 @@ public final class CraftServer implements Server {
+@@ -856,6 +856,7 @@ public final class CraftServer implements Server {
 
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
 +        de.minebench.origami.OrigamiConfig.init((File) console.options.valueOf("origami-settings")); // Origami - Server Config
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -888,6 +889,7 @@ public final class CraftServer implements Server {
+@@ -890,6 +891,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -177,7 +177,7 @@ index 16de617cb5..e093cd26f8 100644
 
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ba4c9c1b0e..b8ef0d93cf 100644
+index 96b98f2572..131eaeaf16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -139,6 +139,14 @@ public class Main {

diff --git a/patches/server/0012-Add-options-for-modifying-pigmen-farm-behaviour.patch b/patches/server/0012-Add-options-for-modifying-pigmen-farm-behaviour.patch
@@ -1,4 +1,4 @@
-From f4d09a003232f61d8cbb407af2c55d8a6a545866 Mon Sep 17 00:00:00 2001
+From 073cab5c416bb4f5e2dd762ef98d6c8e0d7712b4 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 29 Dec 2019 00:53:17 +0100
 Subject: [PATCH] Add options for modifying pigmen farm behaviour
@@ -85,18 +85,18 @@ index 4132cd4c6f..fccc0bf053 100644
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()));
              world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1ee01486f8..941d260532 100644
+index cfb14c54d6..01b1e7e022 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -194,6 +194,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -191,6 +191,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public boolean isTemporarilyActive = false; // Paper
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      public boolean fromNetherPortal; // Paper
 +    public boolean fromMobFarm = false; // Origami - Detect Mobs from mob farms
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1628,6 +1629,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1625,6 +1626,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  nbttagcompound.setBoolean("Paper.FromNetherPortal", true);
              }
              // Paper end
@@ -108,7 +108,7 @@ index 1ee01486f8..941d260532 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1776,6 +1782,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1773,6 +1779,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
              // Paper end
@@ -117,7 +117,7 @@ index 1ee01486f8..941d260532 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 9cf496b5e5..90b16a12d9 100644
+index 04eff01825..eb1abfb7e7 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -736,7 +736,7 @@ public abstract class EntityInsentient extends EntityLiving {

diff --git a/patches/server/0013-Add-origami-command.patch b/patches/server/0013-Add-origami-command.patch
@@ -1,4 +1,4 @@
-From f279427f4916ec096376a3274d4d5b918f3ea890 Mon Sep 17 00:00:00 2001
+From 4042b029731ec04ed88edd692bb0ec172d1c2cf0 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Fri, 3 Jan 2020 15:52:09 +0100
 Subject: [PATCH] Add origami command
@@ -143,10 +143,10 @@ index 0000000000..45f72f7570
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8b2755a3b9..3a0947db54 100644
+index f55dc28f3e..a9b99e4ca1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -170,6 +170,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -166,6 +166,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          com.destroystokyo.paper.PaperConfig.registerCommands();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          // Paper end

diff --git a/patches/server/0014-Call-PreCreatureSpawnEvent-for-more-spawn-reasons.patch b/patches/server/0014-Call-PreCreatureSpawnEvent-for-more-spawn-reasons.patch
@@ -1,4 +1,4 @@
-From c8a437766d12f800580de70c36e4b562beb6a8dd Mon Sep 17 00:00:00 2001
+From 57de8fdc5acaa74c03c68454bc4055b4e2b32946 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Fri, 3 Jan 2020 16:28:31 +0100
 Subject: [PATCH] Call PreCreatureSpawnEvent for more spawn reasons
@@ -9,10 +9,10 @@ Subject: [PATCH] Call PreCreatureSpawnEvent for more spawn reasons
  2 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index e23247e0a8..6aa5ae89b9 100644
+index a71ad8418e..a25483db96 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
-@@ -178,6 +178,16 @@ public class EntityTypes<T extends Entity> {
+@@ -188,6 +188,16 @@ public class EntityTypes<T extends Entity> {
 
      @Nullable
      public T spawnCreature(WorldServer worldserver, @Nullable NBTTagCompound nbttagcompound, @Nullable IChatBaseComponent ichatbasecomponent, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {