Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
This commit is contained in:
github-actions[bot]
2023-05-31 23:54:14 +00:00
parent af9f9f76f3
commit 8c336c7e8e
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0002-Purpur-Server-Changes.patch
View File

@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/build.gradle.kts b/build.gradle.kts
index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2f5ee2f0e 100644
index 3ee1160c796cc86db9bc9438055b307239e9a8f7..9c01005751c0088f560f96401cdfdebbbda4e7ec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,12 +7,8 @@ plugins {
@@ -20228,10 +20228,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea6f6b830a 100644
index a49520fbb3cbce866338c964dd0aadbd113bf411..3f80b16c8d69f284a26b16cf2513a955005bf458 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -20240,7 +20240,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -317,6 +317,20 @@ public final class CraftServer implements Server {
@@ -319,6 +319,20 @@ public final class CraftServer implements Server {
this.structureManager = new CraftStructureManager(console.getStructureManager());
Bukkit.setServer(this);
@@ -20261,7 +20261,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
// Register all the Enchantments and PotionTypes now so we can stop new registration immediately after
Enchantments.SHARPNESS.getClass();
@@ -957,6 +971,7 @@ public final class CraftServer implements Server {
@@ -959,6 +973,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -20269,7 +20269,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
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))
@@ -972,6 +987,7 @@ public final class CraftServer implements Server {
@@ -974,6 +989,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -20277,7 +20277,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -987,6 +1003,7 @@ public final class CraftServer implements Server {
@@ -989,6 +1005,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -20285,7 +20285,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -1429,6 +1446,55 @@ public final class CraftServer implements Server {
@@ -1431,6 +1448,55 @@ public final class CraftServer implements Server {
return true;
}
@@ -20341,7 +20341,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
@Override
public List<Recipe> getRecipesFor(ItemStack result) {
Validate.notNull(result, "Result cannot be null");
@@ -2700,6 +2766,7 @@ public final class CraftServer implements Server {
@@ -2702,6 +2768,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {
@@ -20349,7 +20349,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
@@ -2746,6 +2813,18 @@ public final class CraftServer implements Server {
@@ -2748,6 +2815,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -20368,7 +20368,7 @@ index f025905a7afae894401638a8842a4a44fa41d1ef..d9af2c681f1aa9836930b9a546d638ea
@Override
public void restart() {
org.spigotmc.RestartCommand.restart();
@@ -2959,4 +3038,16 @@ public final class CraftServer implements Server {
@@ -2961,4 +3040,16 @@ public final class CraftServer implements Server {
}
// Paper end
@@ -20789,10 +20789,10 @@ index 4d7a2c4c1001aefe9fcd4be8dbcb414f721bfff9..2c7716a9d65ebda209a144b82c2126b6
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f3e1ba16446ff569f178a4bd16d328e8c2f0e40c..3c31701795b25b16dafe53292e9561dd0bfbe2b5 100644
index 5f0146255b050dfc873789e7dd4bc1dc4a929f02..69fe6480a52dca86b09a331345347e88f77a298d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -533,10 +533,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -534,10 +534,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListName(String name) {
@@ -20809,7 +20809,7 @@ index f3e1ba16446ff569f178a4bd16d328e8c2f0e40c..3c31701795b25b16dafe53292e9561dd
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -1357,6 +1362,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1358,6 +1363,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -20820,7 +20820,7 @@ index f3e1ba16446ff569f178a4bd16d328e8c2f0e40c..3c31701795b25b16dafe53292e9561dd
return false;
}
@@ -2404,6 +2413,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2405,6 +2414,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}
@@ -20849,7 +20849,7 @@ index f3e1ba16446ff569f178a4bd16d328e8c2f0e40c..3c31701795b25b16dafe53292e9561dd
private void validateSpeed(float value) {
if (value < 0) {
if (value < -1f) {
@@ -3174,4 +3205,97 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3180,4 +3211,97 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end