Update Paper

d6f730655 Do not add passengers of entities that were above save limit (#5073) cb99288a5 Try to get a new 1.16.5 build on website now we hopefully fixed site bug 946cdd2d2 [CI-SKIP] [Auto] Rebuild Patches 8f805412b Remove class 13 from netty preload - Fixes #5066 f6d3c6811 Make ProjectileHitEvent Cancellable 97b020f13 make schedule command per world aac07a271 Return chat component with empty text instead of throwing exception. Fixes #3328 f27bc0659 Collision option for requiring a player participant 193f80148 Add StructureLocateEvent 59222b5ba Add sendOpLevel API f792973c2 [CI-SKIP] Update API to 1.16.5 (#5067) ce979b29b Updated Upstream (Bukkit) d3dc24999 Updated Upstream (Bukkit/CraftBukkit/Spigot) 7438bbee4 Improve zombie villager curing exploit fix (#5054) eac03694f Updated Upstream (CraftBukkit) 7232d8f2a EntityLoadCrossbowEvent#shouldConsumeItem 4740bd6c8 Mark PlayerInventory#getItem as nullable bd9ace578 Add a config option to limit the number of entities of each type to load/save in a chunk (#4792) 6bafeb5a9 Move logic from last patch into correct place 9668118fd disable entity ticking flag after watchdog obliteration 6ada26a6d [Auto] Updated Upstream (Spigot) f645e8d08 [Auto] Updated Upstream (Bukkit) ac69804c7 Updated Upstream (Bukkit/Spigot) (#5048)
Minebench · Jan 17, 2021 · ab42df9 · ab42df9
1 parent eb7662a
commit ab42df9
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 43 deletions.
diff --git a/Paper b/Paper
diff --git a/current-paper b/current-paper
@@ -1 +1 @@
-1.16.4--b9c294f5311504cb7da616d5abfc51a2ce768ae6
+1.16.5--96d792e757cc78bf7c0da86b1991b5e843e62381
diff --git a/patches/api/0001-Origami-POM-Changes.patch b/patches/api/0001-Origami-POM-Changes.patch
@@ -1,4 +1,4 @@
-From a3f91586ea71d9f58511e4ba6a269ceecda4ed6c Mon Sep 17 00:00:00 2001
+From 5fc2945c87ff23c14e0f3cd10ab3d4b53001d595 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, 8 insertions(+), 9 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 1c33b1f4d..67347e35c 100644
+index 6c6ae6b48..b37512ddb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,24 +3,23 @@
@@ -25,7 +25,7 @@ index 1c33b1f4d..67347e35c 100644
 -    <groupId>com.destroystokyo.paper</groupId>
 -    <artifactId>paper-api</artifactId>
 +    <artifactId>origami-api</artifactId>
-     <version>1.16.4-R0.1-SNAPSHOT</version>
+     <version>1.16.5-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 cf31f2d497135946f2114298a087f56ad31008fd Mon Sep 17 00:00:00 2001
+From ec5de5bb5603a1b68b957e6ec0f2c13bf363ddf4 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, 9 insertions(+), 10 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 7075a42..69a1156 100644
+index 7712a87..3056ea0 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,24 +3,23 @@
@@ -25,7 +25,7 @@ index 7075a42..69a1156 100644
 -    <groupId>com.destroystokyo.paper</groupId>
 -    <artifactId>paper-mojangapi</artifactId>
 +    <artifactId>origami-mojangapi</artifactId>
-     <version>1.16.4-R0.1-SNAPSHOT</version>
+     <version>1.16.5-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 191cf52304446021025a3fb646c169d7ee540272 Mon Sep 17 00:00:00 2001
+From 89b4329c98bf024579521e76cad91dc7153d3088 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, 55 insertions(+), 14 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 80f1652913..0b69c21059 100644
+index 9ba379b7e3..f5da1bcf44 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -19,17 +19,17 @@ index 80f1652913..0b69c21059 100644
 -    <artifactId>paper</artifactId>
 +    <artifactId>origami</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.4-R0.1-SNAPSHOT</version>
+     <version>1.16.5-R0.1-SNAPSHOT</version>
 -    <name>Paper</name>
 -    <url>https://papermc.io</url>
 +    <name>Origami-Server</name>
 +    <url>https://minebench.de</url>
 
      <properties>
          <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-@@ -13,27 +13,28 @@
-         <api.version>unknown</api.version>
-         <minecraft.version>1.16.4</minecraft.version>
+@@ -14,27 +14,28 @@
+         <bt.name>git</bt.name>
+         <minecraft.version>1.16.5</minecraft.version>
          <minecraft_version>1_16_R3</minecraft_version>
 -        <maven.compiler.source>1.8</maven.compiler.source>
 -        <maven.compiler.target>1.8</maven.compiler.target>
@@ -64,7 +64,7 @@ index 80f1652913..0b69c21059 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -165,7 +166,7 @@
+@@ -173,7 +174,7 @@
 
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -73,7 +73,7 @@ index 80f1652913..0b69c21059 100644
          <defaultGoal>clean install</defaultGoal> <!-- Paper -->
          <plugins>
              <plugin>
-@@ -173,7 +174,7 @@
+@@ -181,7 +182,7 @@
                  <artifactId>gitdescribe-maven-plugin</artifactId>
                  <version>1.3</version>
                  <configuration>
@@ -82,7 +82,7 @@ index 80f1652913..0b69c21059 100644
                      <scmDirectory>..</scmDirectory>
                  </configuration>
                  <executions>
-@@ -415,5 +416,45 @@
+@@ -423,5 +424,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 e2b37ff2c9d34ad5f006bac5149249c4eaedb6ea Mon Sep 17 00:00:00 2001
+From 89e1dad3dbddb30231c17d358d86ed1789a3158c 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,10 +47,10 @@ 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 a7cd98a7cd..b4ca060ebb 100644
+index 8c384171ca..cacd280dfa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1444,7 +1444,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1448,7 +1448,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
 
      public String getServerModName() {
@@ -73,7 +73,7 @@ index dc7de2b59e..1406d17e66 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 010f702ea4..d3bfdf97ea 100644
+index 22bde39593..245a98963b 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/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 07918ff8dc4bc2f1bbe745b914cd28db061d67ba Mon Sep 17 00:00:00 2001
+From cb540b1811a42fa34ff2d58850477436e7e1af17 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,7 +85,7 @@ 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 d9021fde3d..01438c41d9 100644
+index f307a63611..e9e3f968a0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -193,6 +193,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -96,7 +96,7 @@ index d9021fde3d..01438c41d9 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1643,6 +1644,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1644,6 +1645,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  nbttagcompound.setBoolean("Paper.FromNetherPortal", true);
              }
              // Paper end
@@ -108,7 +108,7 @@ index d9021fde3d..01438c41d9 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1796,6 +1802,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1797,6 +1803,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
              // Paper end
@@ -117,7 +117,7 @@ index d9021fde3d..01438c41d9 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 6d716214e7..aa8ba82017 100644
+index eb5c3a1f0d..398a30cda8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -739,7 +739,7 @@ public abstract class EntityInsentient extends EntityLiving {

diff --git a/patches/server/0026-Keep-weather-clear-after-sleep.patch b/patches/server/0026-Keep-weather-clear-after-sleep.patch
@@ -1,27 +1,14 @@
-From 4f1f2049e919c1abd2eb6ffe5a16cb1103f2516b Mon Sep 17 00:00:00 2001
+From 511ba9b9cf47a5c073dd94761ffbf9096d798c52 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 4 Jul 2020 20:08:42 +0100
 Subject: [PATCH] Keep weather clear after sleep
 
 ---
- src/main/java/net/minecraft/server/WorldDataServer.java | 1 +
- src/main/java/net/minecraft/server/WorldServer.java     | 1 +
- 2 files changed, 2 insertions(+)
+ src/main/java/net/minecraft/server/WorldServer.java | 1 +
+ 1 file changed, 1 insertion(+)
 
-diff --git a/src/main/java/net/minecraft/server/WorldDataServer.java b/src/main/java/net/minecraft/server/WorldDataServer.java
-index a7e623044a..d9dbe65701 100644
---- a/src/main/java/net/minecraft/server/WorldDataServer.java
-+++ b/src/main/java/net/minecraft/server/WorldDataServer.java
-@@ -287,6 +287,7 @@ public class WorldDataServer implements IWorldDataServer, SaveData {
-         return this.clearWeatherTime;
-     }
-
-+    public void setClearWeatherTime(int ticks) { this.a(ticks); } // Origami - OFBHELPER
-     @Override
-     public void a(int i) {
-         this.clearWeatherTime = i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5b0b6edfa7..fb205d260e 100644
+index fbe7f43f6c..cceed9d06d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -769,6 +769,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {