Skip to content

Commit cc43efd

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3fd1502 Add missing deprecation (#8886) PaperMC/Paper@773dd72 Updated Upstream (Bukkit/CraftBukkit) (#9739)
1 parent fbedef8 commit cc43efd

16 files changed

Lines changed: 37 additions & 158 deletions

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.20.1-R0.1-SNAPSHOT
33

44
mcVersion = 1.20.1
5-
paperCommit = 1b1c23010ac55e610e3a36f4e5b93a8198cff69c
5+
paperCommit = 773dd724469bae89d0c2075edc3d1ddc8d5b0b18
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

‎patches/api/0005-Purpur-client-support.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index f9dd00210c1762a40259f823aeb8d8a5ddc78e3e..9ee0d60775a00a99c8ac779e8602c619565e6a42 100644
8+
index f59cbc92334c7b7b20e593a58232fb3c4434f12b..205ddc2abe17781da97fafa06f412b8160cb4427 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3271,4 +3271,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3273,4 +3273,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
@Override
1313
Spigot spigot();
1414
// Spigot end

‎patches/api/0010-AFK-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 9ee0d60775a00a99c8ac779e8602c619565e6a42..2ddacd7f74cba66f67ab6957e03522453de01117 100644
8+
index 205ddc2abe17781da97fafa06f412b8160cb4427..fdcbcc9c53d72127b8d1a0072f0f9726f90eb766 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3279,5 +3279,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3281,5 +3281,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* @return True if Player uses Purpur Client
1313
*/
1414
public boolean usesPurpurClient();

‎patches/api/0016-Player-invulnerabilities.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 2ddacd7f74cba66f67ab6957e03522453de01117..1994acf66919c92f59e2a9f2f873f50b73d76d1a 100644
8+
index fdcbcc9c53d72127b8d1a0072f0f9726f90eb766..407940174a485d082350f01e7e5e2b879fb911b5 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3298,5 +3298,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3300,5 +3300,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* Reset the idle timer back to 0
1313
*/
1414
void resetIdleTimer();

‎patches/api/0042-Add-local-difficulty-api.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index 6917931966377c51db88a3364997a110dd987970..1fba792419ea6b5e8c640a2599e4b2dd16ee87d0 100644
8+
index b8b97df069b28fa3cf32f1ad1f01f586a0cfbc78..aa60e6db5705764c8b9e766460c692260a2e8fb3 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -3992,6 +3992,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -4008,6 +4008,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
@Nullable
1313
public DragonBattle getEnderDragonBattle();
1414

‎patches/api/0045-Debug-Marker-API.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd
179179
// Purpur end
180180
}
181181
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
182-
index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd79143cdd 100644
182+
index aa60e6db5705764c8b9e766460c692260a2e8fb3..63bf1d70cce9176f47a158a4a767b1bf38d60dbd 100644
183183
--- a/src/main/java/org/bukkit/World.java
184184
+++ b/src/main/java/org/bukkit/World.java
185-
@@ -4000,6 +4000,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
185+
@@ -4016,6 +4016,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
186186
* @return The local difficulty
187187
*/
188188
public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,10 +260,10 @@ index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd
260260

261261
/**
262262
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
263-
index 1994acf66919c92f59e2a9f2f873f50b73d76d1a..b1a5baf12343f5db11ef58666bf6393b008c7dcf 100644
263+
index 407940174a485d082350f01e7e5e2b879fb911b5..11ef2a302586e276a11360caa7d75101939988ab 100644
264264
--- a/src/main/java/org/bukkit/entity/Player.java
265265
+++ b/src/main/java/org/bukkit/entity/Player.java
266-
@@ -3319,5 +3319,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
266+
@@ -3321,5 +3321,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
267267
* @param invulnerableTicks Invulnerable ticks remaining
268268
*/
269269
void setSpawnInvulnerableTicks(int invulnerableTicks);

‎patches/api/0046-Add-death-screen-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index b1a5baf12343f5db11ef58666bf6393b008c7dcf..9193288438671409cc3cf92033ef7cb60d798b69 100644
8+
index 11ef2a302586e276a11360caa7d75101939988ab..d3d5d2c78cc4ee36beaa355ef7e61ef13332abab 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3389,5 +3389,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3391,5 +3391,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* Clears all debug block highlights
1313
*/
1414
void clearBlockHighlights();

‎patches/server/0001-Pufferfish-Server-Changes.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
2020
along with this program. If not, see <http://www.gnu.org/licenses/>.
2121

2222
diff --git a/build.gradle.kts b/build.gradle.kts
23-
index 8998b8cfd4b0785848ec4b3e33f453548e07cae5..d3124aa84000f1dcf3ea03b91578c8f00d8c5261 100644
23+
index 7e0580bbd0a557c7bb269507a99d25db07bf31f1..4d89c46c7ee559acf986ff5081a42fe91cb5a257 100644
2424
--- a/build.gradle.kts
2525
+++ b/build.gradle.kts
2626
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -1850,7 +1850,7 @@ index 241fec02e6869c638d3a160819b32173a081467b..6a8f9e8f5bf108674c47018def28906e
18501850
public int getContainerSize() {
18511851
return this.container1.getContainerSize() + this.container2.getContainerSize();
18521852
diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
1853-
index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d418352d76c94 100644
1853+
index aee02acd4b2f2fdcb574c37c077fb57013ccb596..5a1c2d62c0e55c5bf16ca3e208dc486bf3b064b2 100644
18541854
--- a/src/main/java/net/minecraft/world/Container.java
18551855
+++ b/src/main/java/net/minecraft/world/Container.java
18561856
@@ -3,6 +3,8 @@ package net.minecraft.world;
@@ -3362,7 +3362,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
33623362

33633363
@Nullable
33643364
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
3365-
index 1150a114e56899758264aa678db4e9ec3e78befc..58a8869b5e23db22cba83aaa2f25e0427742bd1d 100644
3365+
index 74d06790de674cbd230a0b14ac9a6b614c9f84ef..0f89716d1131178bd7ac927ef68337357139e2b7 100644
33663366
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
33673367
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
33683368
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
@@ -3374,7 +3374,7 @@ index 1150a114e56899758264aa678db4e9ec3e78befc..58a8869b5e23db22cba83aaa2f25e042
33743374
private final String serverVersion;
33753375
private final String bukkitVersion = Versioning.getBukkitVersion();
33763376
private final Logger logger = Logger.getLogger("Minecraft");
3377-
@@ -1118,6 +1118,11 @@ public final class CraftServer implements Server {
3377+
@@ -1120,6 +1120,11 @@ public final class CraftServer implements Server {
33783378
plugin.getPluginMeta().getDisplayName(),
33793379
"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."
33803380
));

‎patches/server/0004-Purpur-config-files.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,34 +112,34 @@ index 2f1b2160684bf60715cff541834b714ce62a0241..f8615d9714ac6a9c83d881d6d89b1182
112112
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
113113

114114
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
115-
index 22cb0531514cb72bbd3bd487bcef371bb882cf8e..ece0c8c903e9eb5890a6a770c908e624d0478671 100644
115+
index 3234f6c53d931c13d47a58f8bb16e22b52389b4a..3cdb675a5ae2ca3e4694d379ffe4fdb4f7831e63 100644
116116
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
117117
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
118-
@@ -1035,6 +1035,7 @@ public final class CraftServer implements Server {
118+
@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
119119

120120
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
121121
this.console.paperConfigurations.reloadConfigs(this.console);
122122
+ org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
123123
for (ServerLevel world : this.console.getAllLevels()) {
124124
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
125125
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
126-
@@ -1050,6 +1051,7 @@ public final class CraftServer implements Server {
126+
@@ -1052,6 +1053,7 @@ public final class CraftServer implements Server {
127127
}
128128
}
129129
world.spigotConfig.init(); // Spigot
130130
+ world.purpurConfig.init(); // Purpur
131131
}
132132

133133
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
134-
@@ -1065,6 +1067,7 @@ public final class CraftServer implements Server {
134+
@@ -1067,6 +1069,7 @@ public final class CraftServer implements Server {
135135
this.reloadData();
136136
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
137137
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
138138
+ org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
139139
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
140140
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
141141

142-
@@ -2915,6 +2918,18 @@ public final class CraftServer implements Server {
142+
@@ -2917,6 +2920,18 @@ public final class CraftServer implements Server {
143143
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
144144
}
145145

‎patches/server/0013-Bring-back-server-name.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
1717
public final boolean spawnNpcs = this.get("spawn-npcs", true);
1818
public final boolean pvp = this.get("pvp", true);
1919
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
20-
index ece0c8c903e9eb5890a6a770c908e624d0478671..6eb6c98492667192224dfe6981a2353fe7210a46 100644
20+
index 3cdb675a5ae2ca3e4694d379ffe4fdb4f7831e63..139ff6af8134dd26b0ee40fa3d62a00f55e41694 100644
2121
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2222
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
23-
@@ -3143,4 +3143,11 @@ public final class CraftServer implements Server {
23+
@@ -3145,4 +3145,11 @@ public final class CraftServer implements Server {
2424
}
2525

2626
// Paper end

0 commit comments

Comments
 (0)