Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01: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@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
BillyGalbreath
2022-08-09 08:39:25 -05:00
parent d7b3ae90ce
commit b1925ac31f
18 changed files with 56 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5664,10 +5664,10 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..9a8a7eff47d40d6de558f0946c450531b3984f44 100644
index 964ec590ef5302576ecb3ba2b8ea95dbc2acf103..bfd4520ef6f085685a25cf7f49907e16202e6386 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -5676,7 +5676,7 @@ index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..9a8a7eff47d40d6de558f0946c450531
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -1045,6 +1045,11 @@ public final class CraftServer implements Server {
@@ -1047,6 +1047,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."
));

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

@@ -231,10 +231,10 @@ index c31b9a6b1d4548d507ecb60d42ca9f96f49f6c4b..f613825c69a8d683b8029fe345031259
private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9a8a7eff47d40d6de558f0946c450531b3984f44..98f766bcc078bd14387af0ecdcee2938f4ff1321 100644
index bfd4520ef6f085685a25cf7f49907e16202e6386..7424f3f2f9942170d1f0b98e61b5712901d2fd60 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

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

@@ -29,7 +29,7 @@ index 061716934ba0a1f01e4d85d664034f72b3c7a765..acd95cf1dc7f009b63e44e4404e17362
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 e0dd0fc1638377f4d4226d4b2976b901d635dff0..3673697ac563263ef2dce013e136bc4c141f8783 100644
index dd0143f319d4adef8834c513af34b1cce7a94a84..40f6d9845d2405c6e54c5213618e1b21016e3d3f 100644
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
@@ -318,6 +318,30 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
@@ -84,7 +84,7 @@ index 7c09182f465b66979e1981222d20fa4f574680d5..629024e5c3f480bd50ae2df9dadb72f0
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 817c501bdf31d8247d0d8d0743c67578184dd0fd..a1d9994c39e19a942b0bc605bed1413498e6df16 100644
index b6f5d2aa4c6edb61421a553211ce71592d8c767a..9d68706d23da00700a89b533e9efefa328196064 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -174,6 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -105,10 +105,10 @@ index 817c501bdf31d8247d0d8d0743c67578184dd0fd..a1d9994c39e19a942b0bc605bed14134
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 98f766bcc078bd14387af0ecdcee2938f4ff1321..6fca71fa3cb8c8ff53fe85966f251efecf9b4f6b 100644
index 7424f3f2f9942170d1f0b98e61b5712901d2fd60..c1a8ac2abf79075f4ea70d2cfe1fc577e0e92271 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -959,6 +959,7 @@ public final class CraftServer implements Server {
@@ -961,6 +961,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 98f766bcc078bd14387af0ecdcee2938f4ff1321..6fca71fa3cb8c8ff53fe85966f251efe
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))
@@ -974,6 +975,7 @@ public final class CraftServer implements Server {
@@ -976,6 +977,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -124,7 +124,7 @@ index 98f766bcc078bd14387af0ecdcee2938f4ff1321..6fca71fa3cb8c8ff53fe85966f251efe
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -989,6 +991,7 @@ public final class CraftServer implements Server {
@@ -991,6 +993,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 98f766bcc078bd14387af0ecdcee2938f4ff1321..6fca71fa3cb8c8ff53fe85966f251efe
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2729,6 +2732,18 @@ public final class CraftServer implements Server {
@@ -2736,6 +2739,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -152,7 +152,7 @@ index 98f766bcc078bd14387af0ecdcee2938f4ff1321..6fca71fa3cb8c8ff53fe85966f251efe
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index c55ae77807e0ec3698f0d0443caaf18928b41017..2fae47d9e75a33416e27b6a2256365540149a571 100644
index 5b48047242e20c216b110502935763ea433c55cd..40d86147d4bfcab81c2b4e2d70f5ccdb8e25e606 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -158,6 +158,14 @@ public class Main {

23
patches/server/0006-Fix-decompile-errors.patch
View File

@@ -4,29 +4,6 @@ Date: Sun, 12 Jun 2022 06:20:21 -0500
Subject: [PATCH] Fix decompile errors
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index 2bc8917b7c4512f0607f34b1f18627a391fda07d..b5172f14606981a1e787d662a1cbed9d710071aa 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -118,7 +118,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@Override
public Brain<Allay> getBrain() {
- return super.getBrain();
+ return (Brain<Allay>) super.getBrain(); // Purpur - decompile error
}
public static AttributeSupplier.Builder createAttributes() {
@@ -174,8 +174,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@Override
public boolean hurt(DamageSource source, float amount) {
- Entity optional = source.getEntity();
- if (optional instanceof Player player) {
+ if (source.getEntity() instanceof Player player) { // Purpur - decompile error
Optional<UUID> optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER);
if (optional.isPresent() && player.getUUID().equals(optional.get())) {
return false;
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java

16
patches/server/0008-Ridables.patch
View File

@@ -2194,13 +2194,13 @@ index 45c3cec839a7c23903dedf6e3e004305da2adceb..248531727dcafb71d7d2d2767205e09a
this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index b5172f14606981a1e787d662a1cbed9d710071aa..a4b390af92e5923ca54e37c0feb263bafe2e19de 100644
index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..d9cd71c57cde4cbd7131344ba7760fb6c224c7b6 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -95,10 +95,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
private float dancingAnimationTicks;
@@ -101,10 +101,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
private float spinningAnimationTicks;
private float spinningAnimationTicks0;
public boolean forceDancing = false; // CraftBukkit
+ private org.purpurmc.purpur.controller.FlyingMoveControllerWASD purpurController; // Purpur
public Allay(EntityType<? extends Allay> type, Level world) {
@@ -2220,11 +2220,11 @@ index b5172f14606981a1e787d662a1cbed9d710071aa..a4b390af92e5923ca54e37c0feb263ba
+ };
+ // Purpur end
this.setCanPickUpLoot(this.canPickUpLoot());
PositionSource positionSource = new EntityPositionSource(this, this.getEyeHeight());
this.vibrationListenerConfig = new Allay.AllayVibrationListenerConfig();
@@ -106,6 +119,28 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
this.dynamicJukeboxListener = new DynamicGameEventListener<>(new Allay.JukeboxListener(positionSource, GameEvent.JUKEBOX_PLAY.getNotificationRadius()));
EntityPositionSource entitypositionsource = new EntityPositionSource(this, this.getEyeHeight());
@@ -119,6 +132,28 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
}
// CraftBukkit end
+ // Purpur start
+ @Override
@@ -2250,7 +2250,7 @@ index b5172f14606981a1e787d662a1cbed9d710071aa..a4b390af92e5923ca54e37c0feb263ba
+
@Override
protected Brain.Provider<Allay> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index fdd2c63ff0017bafa544a3cff2ee6d2d62c92cb3..32b31e5efb5fc68430b9bcd4cd972494f53accc8 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java

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

@@ -17,10 +17,10 @@ index a32cfa75a9bea896f558bab646d0868391b069a9..01ca7156d86243a80cd343a2a66be9eb
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 6fca71fa3cb8c8ff53fe85966f251efecf9b4f6b..c9f1b0b48300d0ea24c62eb83198a4cd54d6cd02 100644
index c1a8ac2abf79075f4ea70d2cfe1fc577e0e92271..0f441589561bff0d2f21bf1a1d764422a34ecbee 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2919,4 +2919,11 @@ public final class CraftServer implements Server {
@@ -2926,4 +2926,11 @@ public final class CraftServer implements Server {
}
// Paper end

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

@@ -25,10 +25,10 @@ index 48bf3a9938aae8d6cc847a80cf95cfda305414f5..0d57f093490e7db8d4d726111ba94e9e
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c9f1b0b48300d0ea24c62eb83198a4cd54d6cd02..2bc9c1c16ebac1d7d9fcc69497a8ce2c6cb0b4ce 100644
index 0f441589561bff0d2f21bf1a1d764422a34ecbee..2369be0c9d8cd07c9c1a923736133e53c4b770a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2925,5 +2925,10 @@ public final class CraftServer implements Server {
@@ -2932,5 +2932,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

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

@@ -69,10 +69,10 @@ index 35bd4446652d291c77174c0aa366a9030d5b0bcc..f810ed88c9d1d092308cfde748d0b18b
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 2bc9c1c16ebac1d7d9fcc69497a8ce2c6cb0b4ce..e6e20420878cdbe68633bc75be77c288e94fcc43 100644
index 2369be0c9d8cd07c9c1a923736133e53c4b770a5..85bac0c88b981d6bfec0e36066779ee8c4ed0583 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2686,6 +2686,7 @@ public final class CraftServer implements Server {
@@ -2693,6 +2693,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

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

@@ -51,10 +51,10 @@ index c617a8aacbbefb37d53d0e005e822469d29aa642..e1abe61edfaa7b1497b5367310b49146
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 e6e20420878cdbe68633bc75be77c288e94fcc43..b9217255cd411095b8b4c15d2787a8ee980fb050 100644
index 85bac0c88b981d6bfec0e36066779ee8c4ed0583..67bde88d7921248a1dd6f36386a290e7ac1e9ecc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1419,6 +1419,19 @@ public final class CraftServer implements Server {
@@ -1421,6 +1421,19 @@ public final class CraftServer implements Server {
return true;
}

4
patches/server/0278-Spark-Profiler.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Spark Profiler
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b9217255cd411095b8b4c15d2787a8ee980fb050..f61e0c8a12f2132b307b541525df729eda1a4f51 100644
index 67bde88d7921248a1dd6f36386a290e7ac1e9ecc..2e257704af6dc016303876cf39de971982b21db2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -418,7 +418,38 @@ public final class CraftServer implements Server {
@@ -420,7 +420,38 @@ public final class CraftServer implements Server {
if (!pluginFolder.exists()) {
pluginFolder.mkdirs();
}

6
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -1491,16 +1491,16 @@ index 288c6627906d07c0d223eacd84ae4eb31a349998..9babe636176da3c40598eb5bdac0919a
this.seen.add(i);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index a4b390af92e5923ca54e37c0feb263bafe2e19de..c2ecc0fc1e715c6e019de91da11986b0224a9b94 100644
index d9cd71c57cde4cbd7131344ba7760fb6c224c7b6..0f69e1c4e4b14186e7cb99f170ac4d164d2e252c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -249,12 +249,12 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@@ -265,12 +265,12 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@Override
protected void customServerAiStep() {
- this.level.getProfiler().push("allayBrain");
+ //this.level.getProfiler().push("allayBrain"); // Purpur
this.getBrain().tick((ServerLevel)this.level, this);
this.getBrain().tick((ServerLevel) this.level, this);
- this.level.getProfiler().pop();
- this.level.getProfiler().push("allayActivityUpdate");
+ //this.level.getProfiler().pop(); // Purpur

6
patches/server/0292-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 f61e0c8a12f2132b307b541525df729eda1a4f51..000007e77e73153d3d634a3ab5882916bd8b43a3 100644
index 2e257704af6dc016303876cf39de971982b21db2..0afdaebb071061bc26ae302bfe0d86149227850c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1461,6 +1461,42 @@ public final class CraftServer implements Server {
@@ -1463,6 +1463,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)));
}
@@ -99,7 +99,7 @@ index 824c12db04aaaa750de54fce8a15b386dec1cc08..01313fdd9d5a1909bfbcbf8f613030e7
// Paper start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e05955bb255b0bad396fe93b7225350f73d7d623..f3839c16815b50dfce41c31bc6992dcbbd6759a5 100644
index 6d7947e0d4dd1bae45d5a9ca4adbd4d49a28ee71..6cc714d4044926a84feb5c084f2d15db1c29b21e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2979,5 +2979,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {