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

Update to 1.18.2

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0214-Add-compass-command.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index e787ccc3c21f7e966c1e291579bf7550ee6de696..a4ec8c35c1870810c11e81e79c3b191c4f440f35 100644
index 9e7cc8bf867b6e4f86b55e1f1d3a1cb6233c90f1..7c30d8d61a8e82d8a1f61451090e9bbbca933d2a 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -210,6 +210,7 @@ public class Commands {
@@ -212,6 +212,7 @@ public class Commands {
org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
@@ -17,10 +17,10 @@ index e787ccc3c21f7e966c1e291579bf7550ee6de696..a4ec8c35c1870810c11e81e79c3b191c
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 38a01e62ca99da9d8453b6275c5a1b22fcfa9b9e..f300589fad36c5c9768474a13db74144b760c2a5 100644
index 96c5a7aa62703467a0325d5203ff21a8f6e3fc07..43dbd3d233a6f0f9f762fb68e81ad49b9c9e6dab 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -257,6 +257,7 @@ public class ServerPlayer extends Player {
@@ -255,6 +255,7 @@ public class ServerPlayer extends Player {
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index 38a01e62ca99da9d8453b6275c5a1b22fcfa9b9e..f300589fad36c5c9768474a13db74144
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -479,6 +480,7 @@ public class ServerPlayer extends Player {
@@ -477,6 +478,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index 38a01e62ca99da9d8453b6275c5a1b22fcfa9b9e..f300589fad36c5c9768474a13db74144
}
@Override
@@ -540,6 +542,7 @@ public class ServerPlayer extends Player {
@@ -538,6 +540,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -59,7 +59,7 @@ index 38a01e62ca99da9d8453b6275c5a1b22fcfa9b9e..f300589fad36c5c9768474a13db74144
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 7c0b24c6dbd989697c7fa258f6d7f7b35f5b1d2e..f59247132b92abafc20437f958b69a7964676423 100644
index d993b5dc4428ed1c156359db7efa4a4f9b449f12..34f098aeb69bcbd79324386f3fe6a55146fa6f70 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -265,6 +265,11 @@ public class PurpurConfig {