mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@27516ee Temp fix for EntityType.translationKey
PaperMC/Paper@8fced9d [ci skip] Update paperweight to 1.5.1 (#8856)
PaperMC/Paper@f9dc371 Fix calling UnknownCommandEvent (#8232)
This commit is contained in:
granny 2023-02-17 03:20:27 -08:00
parent fccccfa194
commit 41593baf70
No known key found for this signature in database
19 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -2,7 +2,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.4.1"
id("io.papermc.paperweight.patcher") version "1.5.1"
}
allprojects {

2
gradle.properties
View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.3-R0.1-SNAPSHOT
paperCommit = 5c877113018dca5d02ed86be8088cbf6d5bec94e
paperCommit = f9dc371fd8c56f1ad1359fc3bf1f7a40921ec66f
org.gradle.caching = true
org.gradle.parallel = true

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@ -3544,7 +3544,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f938095d999412d88fa3fcf76b87253034124cb9..c7fc5fcd28812fdc758842b06a6781b2c0e4f3cb 100644
index f1a3d8dae2a61b875e423aebfdfcad2f77d498ff..5077c545e74711d5268d3cfa31926af1e995ea05 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@ -3556,7 +3556,7 @@ index f938095d999412d88fa3fcf76b87253034124cb9..c7fc5fcd28812fdc758842b06a6781b2
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -1066,6 +1066,11 @@ public final class CraftServer implements Server {
@@ -1067,6 +1067,11 @@ public final class CraftServer implements Server {
plugin.getDescription().getName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));
@ -3581,10 +3581,10 @@ index f7ea77dd82d978ad307f99c743efacfb34478b3d..009ab06182359862b8f543030ec4fe4e
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index c51a7f7489a37093e4096b28bfc1031ba6a2b8c2..74fb5a9ae82ace67f7ced202b81bbe864f59308a 100644
index 287e8c4c57ea1737460fdaf114e7eed627a25b2d..b9e4305f515faa14c2afc0ccaf23d205e9c9f858 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -457,7 +457,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

6
patches/server/0003-Rebrand.patch
View File

@ -193,7 +193,7 @@ index 68d16efaf9c2d997afabadcf1ee24c5de685b5b3..861cd9f092a19aca520c2be4ba7a6ee3
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c7fc5fcd28812fdc758842b06a6781b2c0e4f3cb..22c9cbb8f0d43650a8d021fac8b9efae4478c9e6 100644
index 5077c545e74711d5268d3cfa31926af1e995ea05..0c75b7f595dc14c02f6384f786a3943f4e16bcef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@ -259,10 +259,10 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..d1526ed7197b883e1d1f07baf285bf5e
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 74fb5a9ae82ace67f7ced202b81bbe864f59308a..1395609e4656c4b6a1ca17f34eba1398c0927ee6 100644
index b9e4305f515faa14c2afc0ccaf23d205e9c9f858..feacdb99ce7ec21fb85b5a13be7a7cb530a40e21 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -457,7 +457,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

12
patches/server/0004-Purpur-config-files.patch
View File

@ -29,7 +29,7 @@ index 061716934ba0a1f01e4d85d664034f72b3c7a765..9713263c3bd34ab8a3bfc0a8797ba0b1
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
index ae5dd08de75a7ed231295f306fd0974da3988249..b8d49f7607c646216d42f4e047997d47b49f228f 100644
index 7b6b51392b123d34382233adcf4c3d4867bdaa32..ccc78857b51e25640ec1e4dcfe4c76a06d1bbff4 100644
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
@@ -317,6 +317,30 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
@ -105,10 +105,10 @@ index 42299fd6ae663b01bb5f010b96887caa744dcb96..816f906f98adc180f37d2b216628e576
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b82b4c2c1d 100644
index 0c75b7f595dc14c02f6384f786a3943f4e16bcef..0fcc3685f3f5b5c81a85f6981541f2cecc386da3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -980,6 +980,7 @@ public final class CraftServer implements Server {
@@ -981,6 +981,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@ -116,7 +116,7 @@ index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b8
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -995,6 +996,7 @@ public final class CraftServer implements Server {
@@ -996,6 +997,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@ -124,7 +124,7 @@ index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b8
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1010,6 +1012,7 @@ public final class CraftServer implements Server {
@@ -1011,6 +1013,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@ -132,7 +132,7 @@ index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b8
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2769,6 +2772,18 @@ public final class CraftServer implements Server {
@@ -2770,6 +2773,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

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

@ -17,10 +17,10 @@ index c7e4330c93baff1f3027d7c75cf857b673d38970..5134fed0cd0eedbe0c2177bce91b978b
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 37b4f6ec19ef2c847214e127c258e1b82b4c2c1d..f50e2ebef64652f5fb396676dbc245692da2443f 100644
index 0fcc3685f3f5b5c81a85f6981541f2cecc386da3..45f75ebc00f0e371066bb244a61c8d68a57c68c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2959,4 +2959,11 @@ public final class CraftServer implements Server {
@@ -2960,4 +2960,11 @@ public final class CraftServer implements Server {
}
// Paper end

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

@ -25,10 +25,10 @@ index 70d3fc30e21a6c3c3d7a87ce2e43dd2eb8322b2c..7c731c72a19c43f4b291557310c632f3
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f50e2ebef64652f5fb396676dbc245692da2443f..9cc8199345bf38f05449836d88b31413cfa688ec 100644
index 45f75ebc00f0e371066bb244a61c8d68a57c68c8..e451348e26c024d48dfccbc6f182544baef7ff3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2965,5 +2965,10 @@ public final class CraftServer implements Server {
@@ -2966,5 +2966,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

6
patches/server/0047-Skip-events-if-there-s-no-listeners.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 330f6c79417378da855326b4da665f9d240e748d..6c5d34d65a821c17c464e0868b7b50c0c39ec8db 100644
index e92864ecf32dd984f6f87f7b05341e43af3a2977..63c83768292e8a8bbedb8719c191bbc09d4777a0 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -425,6 +425,7 @@ public class Commands {
@@ -448,6 +448,7 @@ public class Commands {
private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
// Paper end - Async command map building
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
@ -16,7 +16,7 @@ index 330f6c79417378da855326b4da665f9d240e748d..6c5d34d65a821c17c464e0868b7b50c0
PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
event.getPlayer().getServer().getPluginManager().callEvent(event);
@@ -435,6 +436,7 @@ public class Commands {
@@ -458,6 +459,7 @@ public class Commands {
}
}
// CraftBukkit end

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

@ -69,10 +69,10 @@ index 779d14840fdb0b27e1bb49e680c59539294b2995..96f50760dec9fb7ec317b500ce5cd6a6
lagging = recentTps[0] < org.purpurmc.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 9cc8199345bf38f05449836d88b31413cfa688ec..055a2dbcdc6848302efc6937fc7406e1cb0759e6 100644
index e451348e26c024d48dfccbc6f182544baef7ff3f..102302a6884b8a8cf850f25983bb48205af298b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2726,6 +2726,7 @@ public final class CraftServer implements Server {
@@ -2727,6 +2727,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

4
patches/server/0065-Add-ping-command.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add ping command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 6c5d34d65a821c17c464e0868b7b50c0c39ec8db..2de0639ec22d731129ee3d5733dbf5509764c274 100644
index 63c83768292e8a8bbedb8719c191bbc09d4777a0..bcf7d80fc35325c167c311b5d8f763441abfac18 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -215,6 +215,7 @@ public class Commands {
@@ -216,6 +216,7 @@ public class Commands {
SetPlayerIdleTimeoutCommand.register(this.dispatcher);
StopCommand.register(this.dispatcher);
WhitelistCommand.register(this.dispatcher);

4
patches/server/0066-Add-demo-command.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add demo command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 2de0639ec22d731129ee3d5733dbf5509764c274..24bb481c2e7163ec41e21d79bcac19db67a4fba1 100644
index bcf7d80fc35325c167c311b5d8f763441abfac18..ead640a7239afefc88e09a393a18839e2ef510e3 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -215,6 +215,7 @@ public class Commands {
@@ -216,6 +216,7 @@ public class Commands {
SetPlayerIdleTimeoutCommand.register(this.dispatcher);
StopCommand.register(this.dispatcher);
WhitelistCommand.register(this.dispatcher);

4
patches/server/0067-Add-credits-command.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add credits command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 24bb481c2e7163ec41e21d79bcac19db67a4fba1..a7eee1f0ed063d1006c91adcac92e142c7d6701b 100644
index ead640a7239afefc88e09a393a18839e2ef510e3..a819786ca8374dc8ab0008ea8993a60da8921dfb 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -215,6 +215,7 @@ public class Commands {
@@ -216,6 +216,7 @@ public class Commands {
SetPlayerIdleTimeoutCommand.register(this.dispatcher);
StopCommand.register(this.dispatcher);
WhitelistCommand.register(this.dispatcher);

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

@ -5,10 +5,10 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index a7eee1f0ed063d1006c91adcac92e142c7d6701b..880eb2697c156a1bdf81582a8cc4862a6892f042 100644
index a819786ca8374dc8ab0008ea8993a60da8921dfb..48d8e857def61b7342d251ce1209c735228f5295 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -218,6 +218,7 @@ public class Commands {
@@ -219,6 +219,7 @@ public class Commands {
org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur

4
patches/server/0194-Add-uptime-command.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add uptime command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 880eb2697c156a1bdf81582a8cc4862a6892f042..b779b4a7118fbcc24752369a5944536f5ecccaf1 100644
index 48d8e857def61b7342d251ce1209c735228f5295..6c6ff5e192a4a2273a4ce7330ec3c3e0748b632d 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -218,6 +218,7 @@ public class Commands {
@@ -219,6 +219,7 @@ public class Commands {
org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur

8
patches/server/0204-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 b779b4a7118fbcc24752369a5944536f5ecccaf1..244f5b5a7a7e781c27d21477d798f65ff77d4bc6 100644
index 6c6ff5e192a4a2273a4ce7330ec3c3e0748b632d..3501c04a9dd745b56d701bc20e18ead4add726f5 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -220,6 +220,7 @@ public class Commands {
@@ -221,6 +221,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,7 +17,7 @@ index b779b4a7118fbcc24752369a5944536f5ecccaf1..244f5b5a7a7e781c27d21477d798f65f
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 4d984fc18bba2da2dd709440dbf845ee1586f677..3f642a1a6d74d80d78e06441b50769810b820364 100644
index deac14655caf03a95034c77aa7fd2bd807eb48a9..3dd0dab4a56dab8cbe833d53ecdd5a8a3d2e8198 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
@ -89,7 +89,7 @@ index 31f5d9bcc11dc78b0d04c55560d5a2fa18bf3896..42532975d8c5558a7598e759838e75f2
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 27b06d6ebe464c14b7795161a0692540858ad4f9..a2d367b331bb9e23643a64172385798adfc57552 100644
index 6d739c7d355a569380f22c8c2ced499ea339b2e6..66e5521e3c9fef9fa7d0fbeafe88e328acc5b828 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -223,6 +223,7 @@ public class PurpurWorldConfig {

4
patches/server/0217-Added-the-ability-to-add-combustible-items.patch
View File

@ -51,10 +51,10 @@ index bbff7466cecf50285c97fadaf68682a6c6ea879f..5ae858b81e6f9903b7296077cf497f62
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 055a2dbcdc6848302efc6937fc7406e1cb0759e6..cd1906a3dcb52de5deed02e1b0005fe83c91f211 100644
index 102302a6884b8a8cf850f25983bb48205af298b8..ab3e5b4bfd3968d9d758d35bdcebfd7662dbb8a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1454,6 +1454,19 @@ public final class CraftServer implements Server {
@@ -1455,6 +1455,19 @@ public final class CraftServer implements Server {
return true;
}

20
patches/server/0279-Remove-Mojang-Profiler.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 244f5b5a7a7e781c27d21477d798f65ff77d4bc6..a6996259f9fcb2d6520ca45fa42b11c42824ef9d 100644
index 3501c04a9dd745b56d701bc20e18ead4add726f5..71fe34621178af4ae9e9aa0ee945c235f69ba7be 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -144,7 +144,7 @@ public class Commands {
@@ -145,7 +145,7 @@ public class Commands {
CloneCommands.register(this.dispatcher, commandRegistryAccess);
DataCommands.register(this.dispatcher);
DataPackCommand.register(this.dispatcher);
@ -17,7 +17,7 @@ index 244f5b5a7a7e781c27d21477d798f65ff77d4bc6..a6996259f9fcb2d6520ca45fa42b11c4
DefaultGameModeCommands.register(this.dispatcher);
DifficultyCommand.register(this.dispatcher);
EffectCommands.register(this.dispatcher, commandRegistryAccess);
@@ -306,9 +306,9 @@ public class Commands {
@@ -309,9 +309,9 @@ public class Commands {
public int performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label) { // CraftBukkit
CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
@ -29,7 +29,7 @@ index 244f5b5a7a7e781c27d21477d798f65ff77d4bc6..a6996259f9fcb2d6520ca45fa42b11c4
byte b0;
@@ -371,7 +371,7 @@ public class Commands {
@@ -394,7 +394,7 @@ public class Commands {
b0 = 0;
}
} finally {
@ -750,7 +750,7 @@ index ece55efcd566bcb9b06d305496ab745807cfe975..b396a329e753f42b3878736b6b14bafd
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 421493a14ac3908d4ae4032e4f19922598206135..48b09b1fe0d316277a46cab700d790a1d35d3fc4 100644
index bec3d455ae3f639fbfda568c2573bacaa1ba7ccd..5822e94dcfb90615a98d4862ffb300a2140aaee7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1184,7 +1184,7 @@ public class ServerPlayer extends Player {
@ -783,7 +783,7 @@ index 421493a14ac3908d4ae4032e4f19922598206135..48b09b1fe0d316277a46cab700d790a1
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index e57ef9c60163d8ee13547d87169ccd0daec4acd4..731516cc0e7a6a16874b5c9d533f2beb84397e06 100644
index d468bb5e61ba25cfb2b462e2d0852256c64034d6..1cdb800ca42aa2c42feafc07f38b8f6bcecb4f5e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -405,7 +405,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@ -1135,7 +1135,7 @@ index 6409e72cf4c6b8fbd21d1a97610160f604b8dc95..b54cabc765c187cd1788cc61dc271909
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index a1ef049460b1b8a257e09b52b7385fc6555f6472..cd538b09f74170306d18fab9b16fd5750e8cc3ed 100644
index b9917a872b6a2231ead62c8a1c4e4eeb79a227ab..4a8f08ceb0f662b4356bbe80fc207e6e8a48c7ad 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -398,7 +398,7 @@ public abstract class LivingEntity extends Entity {
@ -1246,7 +1246,7 @@ index a1ef049460b1b8a257e09b52b7385fc6555f6472..cd538b09f74170306d18fab9b16fd575
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 535b13206e4a8a68e1fb226b3c44890face3b55f..7bd4e95fcaf3855a4fe412b5898a97d7992caad3 100644
index af1c7af8e750ce62ac07fdce5f6915e997431e8c..43cc8e8f07adecef21c70954918b8945a7c3ef62 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -332,14 +332,14 @@ public abstract class Mob extends LivingEntity {
@ -1483,7 +1483,7 @@ index 183f67a32203b02b43ca3d612f950f288c754eac..867091706521dbb16e66bdf5c9f41367
Optional<Integer> optional = this.getBrain().getMemory(MemoryModuleType.PLAY_DEAD_TICKS);
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index e81b65476a6885b949b96f1d85df652c8cf56d5c..f9d77ad2493b9ba67e8f45ce248d29a8e9ab7b80 100644
index 0ddae1d558316ca7129e51d59d4189fc8dd03c1a..c942f0093e0b88ec8a904698a613c64a8c42bc43 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -153,13 +153,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
@ -1656,7 +1656,7 @@ index 456ebb0829d19d13abe05d83035c4abe3589962f..17df2b09542f67cdd1d83f795d9b2aad
if ((this.tickCount + this.getId()) % 120 == 0) {
Warden.applyDarknessAround(worldserver, this.position(), this, 20);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 700d32abc957769960fd081072c941681474f7f0..832469e39901d9ec666ddaf3aff77419f6195b1c 100644
index 1f9a9f535c54481fc16bec5db4111ca1eba409df..aed1d9ccffe471b6c2a1d52d2d3d097f6431318b 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -335,7 +335,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

4
patches/server/0282-Debug-Marker-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 97f357a6c8d600daf68b249e04da1f7008b14302..72d9726ac8d06502f6123aea039e026ad6529661 100644
index 39ca67f8b6b81b807f14e12137f4cb28d81bc5d4..799fdf506d57a729ccbb28da70678ccb1e02d152 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1502,6 +1502,42 @@ public final class CraftServer implements Server {
@@ -1503,6 +1503,42 @@ public final class CraftServer implements Server {
public void removeFuel(org.bukkit.Material material) {
net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
}

6
patches/server/0288-Implement-ram-and-rambar-commands.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Implement ram and rambar commands
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index a6996259f9fcb2d6520ca45fa42b11c42824ef9d..1a6f3c602437eaedbc96f1d47d08ff3ab25c0469 100644
index 71fe34621178af4ae9e9aa0ee945c235f69ba7be..139a57b38eac74887c950041e890e1613d8d3073 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -221,6 +221,8 @@ public class Commands {
@@ -222,6 +222,8 @@ public class Commands {
org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.CompassCommand.register(this.dispatcher); // Purpur
@ -18,7 +18,7 @@ index a6996259f9fcb2d6520ca45fa42b11c42824ef9d..1a6f3c602437eaedbc96f1d47d08ff3a
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 48b09b1fe0d316277a46cab700d790a1d35d3fc4..d62bf95fb067c2e2a4fc9b2757c636bd4ee75bea 100644
index 5822e94dcfb90615a98d4862ffb300a2140aaee7..8664b5cfc739fc6b57643210cac3d03b279a59a1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -270,6 +270,7 @@ public class ServerPlayer extends Player {