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

update paper

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-20 16:41:59 -05:00
parent 5455ba8ace
commit 11c5bd4796
11 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -1,7 +1,7 @@
plugins {
java
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
id("io.papermc.paperweight.patcher") version "1.1.5"
id("io.papermc.paperweight.patcher") version "1.1.6"
}
repositories {

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=net.pl3x.purpur
version=1.17-R0.1-SNAPSHOT
packageVersion=1_17_R1
paperCommit=33d6b6fbcddcc768f36143b883fe8aaf9c2d3e09
paperCommit=e31ad11127e9971958ceb2d236a92b12f9892b25
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx3G

10
patches/server/0002-Purpur-config-files.patch
View File

@@ -435,10 +435,10 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faabd3dd0bd 100644
index 92eb2dd977fbe00f7f2785e77f6d98c026bcbe2e..337bd4b47eab7c8b1d23c9bdeb7324f074191790 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -879,6 +879,7 @@ public final class CraftServer implements Server {
@@ -875,6 +875,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
@@ -446,7 +446,7 @@ index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faa
for (ServerLevel world : this.console.getAllLevels()) {
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
@@ -913,6 +914,7 @@ public final class CraftServer implements Server {
@@ -909,6 +910,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -454,7 +454,7 @@ index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faa
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -928,6 +930,7 @@ public final class CraftServer implements Server {
@@ -924,6 +926,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -462,7 +462,7 @@ index fccb85a34b799fd8ac85707e8fd43a08ae2b5fc4..2ae64cad8b482f943163494ac8264faa
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2368,6 +2371,18 @@ public final class CraftServer implements Server {
@@ -2364,6 +2367,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

4
patches/server/0010-Bring-back-server-name.patch
View File

@@ -17,10 +17,10 @@ index c9d80a5430cc66d6189bf337770af43121a5bfd5..329336d413317388455fbbf03036cee1
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2ae64cad8b482f943163494ac8264faabd3dd0bd..afb817d7aeeaf06a0308b84e22e7290f6f39904f 100644
index 337bd4b47eab7c8b1d23c9bdeb7324f074191790..7f4926f640736c52ed1dcfed57b3e4cbbb5b89a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2537,4 +2537,11 @@ public final class CraftServer implements Server {
@@ -2533,4 +2533,11 @@ public final class CraftServer implements Server {
}
// Paper end

4
patches/server/0013-Lagging-threshold.patch
View File

@@ -41,10 +41,10 @@ index 5fd47073ccf6b1ff12b0a704244143070375385f..1b81e50a3c7dc33fa0ee6ce5b4915979
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index afb817d7aeeaf06a0308b84e22e7290f6f39904f..47401670f1b97e6e4f8a435d6ff4eac29a5c528d 100644
index 7f4926f640736c52ed1dcfed57b3e4cbbb5b89a9..764bf014fea5fc4ee1ad903a94dd8f3fde186522 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2543,5 +2543,10 @@ public final class CraftServer implements Server {
@@ -2539,5 +2539,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

8
patches/server/0017-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 01218ca19f0fd2a6cf8194d4507e40c5bc785b7c..928a931e4543a87c9b3294108843ad686d4ac2ae 100644
index 65e59e3bfc07e1ba6fadd7d83e0f5eb7a58fcf78..609afae1bfdbeb82fb48bdbb0200427a67f1cd2a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 01218ca19f0fd2a6cf8194d4507e40c5bc785b7c..928a931e4543a87c9b3294108843ad68
@Override
public Scoreboard getScoreboard() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index f29f05ab4bace2a6db23ef6b9d4c9db285a082e0..5f54905841956b691bf83a4d980c24e0969e9456 100644
index a3bea3b4b8094daac108644d97d2e8a1cc027607..3dcaaeab3ba3b4f74fd454c548461263767ce1c4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1860,6 +1860,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -77,10 +77,10 @@ index f29f05ab4bace2a6db23ef6b9d4c9db285a082e0..5f54905841956b691bf83a4d980c24e0
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index d76d8d8db7921d16f87dd162ccd115e351cde106..fb29b0cb962db93489ff4268c72e7c67cd736867 100644
index a6ecbb7eb1df7923d58366327e0f00512a3a1677..6857abb1b741794d7eda507f738178eb998039f0 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -984,6 +984,8 @@ public abstract class PlayerList {
@@ -990,6 +990,8 @@ public abstract class PlayerList {
}
// Paper end

21
patches/server/0044-Signs-allow-color-codes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 660649624281928ab4eb79f09a90e2f9facf36d6..fc4d66897fe0720d8dfbe7ac289ec9e1fe71d655 100644
index 609afae1bfdbeb82fb48bdbb0200427a67f1cd2a..ce9a348796a8c262e144c09d753cda2e28998fbf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1459,6 +1459,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 660649624281928ab4eb79f09a90e2f9facf36d6..fc4d66897fe0720d8dfbe7ac289ec9e1
this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5b5993c4687f4414c0b7e9bbd9a7d2fa4c66e568..88233e6bb9d3c690d12aa3adf7b5a4ea33ad1db2 100644
index f3393ada26ab9ad15ab219155100c9fa10821366..7c5af939e8c775b4a97a8247687df670e3702150 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3001,9 +3001,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,21 +43,12 @@ index 5b5993c4687f4414c0b7e9bbd9a7d2fa4c66e568..88233e6bb9d3c690d12aa3adf7b5a4ea
+ lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(raw)));
}
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.cserver.getPlayer(this.player), lines);
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
index 9b5d11ece006d7aa893360a84ba652c666517ac1..3373c21f90eb08e2bfbb71bc348d085aad77de77 100644
index 9b5d11ece006d7aa893360a84ba652c666517ac1..2519e8946064a2326ef9acde1e66d0671a62daed 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -4,6 +4,8 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import java.util.UUID;
import java.util.function.Function;
import javax.annotation.Nullable;
+
+import io.papermc.paper.adventure.PaperAdventure;
import net.minecraft.commands.CommandSource;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.core.BlockPos;
@@ -180,6 +182,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
@@ -180,6 +180,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
return filtered ? this.filteredMessages : this.messages;
}
@@ -65,7 +56,7 @@ index 9b5d11ece006d7aa893360a84ba652c666517ac1..3373c21f90eb08e2bfbb71bc348d085a
+ public ClientboundBlockEntityDataPacket getTranslatedUpdatePacket(boolean filtered) {
+ CompoundTag nbt = save(new CompoundTag());
+ for (int i = 0; i < 4; ++i) {
+ String line = PaperAdventure.LEGACY_AMPERSAND.serialize(PaperAdventure.asAdventure(getMessages(filtered)[i]));
+ String line = io.papermc.paper.adventure.PaperAdventure.LEGACY_AMPERSAND.serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(getMessages(filtered)[i]));
+ nbt.putString("Text" + (i + 1), net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().serialize(net.kyori.adventure.text.Component.text(line)));
+ }
+ nbt.putString("PurpurEditor", "true");

4
patches/server/0053-Add-permission-for-F3-N-debug.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index fb29b0cb962db93489ff4268c72e7c67cd736867..d613b5bf9d0be9b8593d4cc02b8cb77a1f49938a 100644
index 6857abb1b741794d7eda507f738178eb998039f0..8a2568a6af89cf1d979bf8accf5d9c7bfdbfdec8 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1149,6 +1149,7 @@ public abstract class PlayerList {
@@ -1155,6 +1155,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + i);
}

4
patches/server/0069-Add-5-second-tps-average-in-tps.patch
View File

@@ -69,10 +69,10 @@ index 36d26af5b28e96cee930307b6d18edd7bfae8f23..91e6d0b6560ffa8e870eca9707d5cd11
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 47401670f1b97e6e4f8a435d6ff4eac29a5c528d..35c53c61db95ca88cfdf4db4126be1e094032296 100644
index 764bf014fea5fc4ee1ad903a94dd8f3fde186522..20100134388ade9f949259c0b3df3c78122695c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2325,6 +2325,7 @@ public final class CraftServer implements Server {
@@ -2321,6 +2321,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

4
patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index d613b5bf9d0be9b8593d4cc02b8cb77a1f49938a..7bab62ac11d31f9eb0936f8c8540ad19685b49ee 100644
index 8a2568a6af89cf1d979bf8accf5d9c7bfdbfdec8..75d2dbe9092b8f46d102bf50d616bc37883f8375 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -998,22 +998,22 @@ public abstract class PlayerList {
@@ -1004,22 +1004,22 @@ public abstract class PlayerList {
}
public void tick() {

4
patches/server/0141-Implement-TPSBar.patch
View File

@@ -42,10 +42,10 @@ index 5fa2723c9899c69ac326f95acf49cd47406378f9..a9098119009b60ea8dbdb4c118cfc20b
}
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7bab62ac11d31f9eb0936f8c8540ad19685b49ee..f71097f1386de7ba6aaaffe8728e9ac18c5270c5 100644
index 75d2dbe9092b8f46d102bf50d616bc37883f8375..3a17a29325e5df7d0fad90819a77cf5b4edb73be 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -593,6 +593,8 @@ public abstract class PlayerList {
@@ -599,6 +599,8 @@ public abstract class PlayerList {
if (entityplayer.didPlayerJoinEvent) this.cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());