Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.16.3

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7d85344e (1.16.3) Missed some fixes to include in commit
64ed4298 (FIRST 1.16.3): Update Paper to 1.16.3
fa9c5e0f (FINAL 1.16.2) Improve Entity Activation Range passenger behavior
6fda3fd0 (FINAL 1.16.2) Improve Timings support for Active vs Inactive vs Passengers
794e6baf Add additional open container api to HumanEntity
44e822f7 Fix block data exception when cancelling PortalCreateEvent (#4199)
This commit is contained in:
William Blake Galbreath
2020-09-10 21:09:10 -05:00
parent de30a3e5e2
commit dc49efe49a
22 changed files with 194 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0002-Rebrand.patch
View File

@@ -5,17 +5,17 @@ Subject: [PATCH] Rebrand
diff --git a/pom.xml b/pom.xml
index 4f45b8158..02ee19722 100644
index f009b05e4..c6bd3d4fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuinity</artifactId>
+ <artifactId>purpur</artifactId>
<packaging>jar</packaging>
<version>1.16.2-R0.1-SNAPSHOT</version>
<version>1.16.3-R0.1-SNAPSHOT</version>
- <name>Tuinity-Server</name>
- <url>https://github.com/Spottedleaf/Tuinity</url>
+ <name>Purpur-Server</name>
@@ -98,7 +98,7 @@ index 74ed02fa9..c1280478e 100644
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 106661fae..045c21d00 100644
index 64f7e448c..bab892a93 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -232,7 +232,7 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2b0e1e698..0b789d179 100644
index 77adc7528..6d21293e5 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
@@ -245,7 +245,7 @@ index 2b0e1e698..0b789d179 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index a9728c6c5..aef0a0eb1 100644
index b5ec7a161..88f58e755 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 {