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

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
6fd9275 Fix Bossbar updating (closes #6061) (#6076)

Tuinity Changes:
a4009b4 Apply paper's reobf mappings patch
a7dcd62 Make getHardCollidingEntities only return hard colliding entities
This commit is contained in:
William Blake Galbreath
2021-07-03 19:55:06 -05:00
parent 0568bffd09
commit 2d32233ed8
10 changed files with 61 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9574429f6 100644
index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..f88ade92a25cb5eda7abc658551a42318af66ce9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,8 +30,8 @@ repositories {
@@ -36,8 +36,8 @@ repositories {
}
dependencies {
@@ -19,7 +19,7 @@ index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -61,6 +61,7 @@ dependencies {
@@ -67,6 +67,7 @@ dependencies {
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
implementation("io.netty:netty-all:4.1.65.Final") // Paper
@@ -27,7 +27,7 @@ index f766183883f009368b79e1201553c184a373e2cf..fba83a632abace5c2b280ea5919175f9
implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
@@ -82,7 +83,7 @@ tasks.jar {
@@ -88,7 +89,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -220,7 +220,7 @@ index 0000000000000000000000000000000000000000..cabfcebf9f944f7a2a2a1cffc7401435
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2aa45667054a721465f353f0500e30d90f7d16a4..c61ff190f04ac3d765d34f3eeb6a927d49f8d491 100644
index 130a088e694b85f7d56620352f044161ea56caf3..818dde63df240c7e72526ef0aef87c9f8739f78a 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