Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@23fe116 Fix missing debug trace
PaperMC/Paper@b0c9b9c Only remove worldgen block entity on changed block (#10794)
PaperMC/Paper@9c917fe [ci skip] Clean up paperclip build-pr workflow (#10802)
PaperMC/Paper@9d6f2cc [ci skip] Rebuild patches (#10803)
This commit is contained in:
granny
2024-05-28 13:13:18 -07:00
parent 2842b97ddf
commit ec1b4fa7ad
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.6-R0.1-SNAPSHOT version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6 mcVersion = 1.20.6
paperCommit = 347bbe389786d5cdae7cd1c6ec32cacba2a9aac7 paperCommit = 9d6f2cced75c1a433c508ab531a61872bce73854
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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

@@ -112,7 +112,7 @@ index 14281a4e72f49dc4eb2ca3da8479c1f81a3a175d..be8bc5b5d5fdf41da40fb5aef9e6bb16
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index af015237214cebc4d1c4bb9e9c5f939d433e365c..68902ec8122314d75d70ebdd3e7392cca8a6c53c 100644 index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..934b942d1e8fdd0b9b3c1f704d514f06a9556623 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1033,6 +1033,7 @@ public final class CraftServer implements Server { @@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
@@ -139,7 +139,7 @@ index af015237214cebc4d1c4bb9e9c5f939d433e365c..68902ec8122314d75d70ebdd3e7392cc
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3029,6 +3032,18 @@ public final class CraftServer implements Server { @@ -3030,6 +3033,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
} }

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

@@ -17,10 +17,10 @@ index 9d10cdacb3aed2c00dc60aeb6f2cbeb48905e21f..842f382de43df5d5c321422372ec30cc
public final boolean spawnNpcs = this.get("spawn-npcs", true); public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 68902ec8122314d75d70ebdd3e7392cca8a6c53c..cfa894a74ce616306fcc55664b29166e36c74ee1 100644 index 934b942d1e8fdd0b9b3c1f704d514f06a9556623..635666762408b9e62ace15703c75f2dbcc768967 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3271,4 +3271,11 @@ public final class CraftServer implements Server { @@ -3272,4 +3272,11 @@ public final class CraftServer implements Server {
return this.potionBrewer; return this.potionBrewer;
} }
// Paper end // Paper end

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

@@ -25,10 +25,10 @@ index 6464cf3cf027d894d18d1a24495952d304151648..87957873de7f8cea2ae84abf04c99a42
} }
// Paper end - further improve server tick loop // Paper end - further improve server tick loop
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cfa894a74ce616306fcc55664b29166e36c74ee1..19dd84902702d3c2fcff624b81c4b23fee9e9948 100644 index 635666762408b9e62ace15703c75f2dbcc768967..e1f7b8c6edbecc1cfdc35a3d508044dcc984e647 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3277,5 +3277,10 @@ public final class CraftServer implements Server { @@ -3278,5 +3278,10 @@ public final class CraftServer implements Server {
public String getServerName() { public String getServerName() {
return this.getProperties().serverName; return this.getProperties().serverName;
} }

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

@@ -74,10 +74,10 @@ index 096c89bd01cec2abd151bf6fffc4847d1bcd548f..cd0a8a6a1be75cab8bbb8ee3ac17bb73
this.values[this.vp++ & 0xFF] = (int)(l * 100L / Runtime.getRuntime().maxMemory()); this.values[this.vp++ & 0xFF] = (int)(l * 100L / Runtime.getRuntime().maxMemory());
this.repaint(); this.repaint();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 19dd84902702d3c2fcff624b81c4b23fee9e9948..8bfb9c9445200b142af3bf9118c0f7c2d1b11501 100644 index e1f7b8c6edbecc1cfdc35a3d508044dcc984e647..70e252cbd6d516875b0e6de1f51b9afb34c58f48 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3073,6 +3073,7 @@ public final class CraftServer implements Server { @@ -3074,6 +3074,7 @@ public final class CraftServer implements Server {
@Override @Override
public double[] getTPS() { public double[] getTPS() {
return new double[] { return new double[] {

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

@@ -51,10 +51,10 @@ index ce2c424068001eec16032361baa206f6a5aa5332..c02d638b8f117156c815821207a91c55
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8bfb9c9445200b142af3bf9118c0f7c2d1b11501..5e538df03bdbad95227acee2c96d5e03f6b153f8 100644 index 70e252cbd6d516875b0e6de1f51b9afb34c58f48..d78062e40bb4cec0f69c58de305527a640799a53 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1570,6 +1570,19 @@ public final class CraftServer implements Server { @@ -1571,6 +1571,19 @@ public final class CraftServer implements Server {
return true; return true;
} }

4
patches/server/0258-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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5e538df03bdbad95227acee2c96d5e03f6b153f8..3542dde0942a0354e77dacf25811ee46c0eace21 100644 index d78062e40bb4cec0f69c58de305527a640799a53..a207163168ff3ac6827bec209a24ee92c0c1dfe5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1581,6 +1581,42 @@ public final class CraftServer implements Server { @@ -1582,6 +1582,42 @@ public final class CraftServer implements Server {
public void removeFuel(org.bukkit.Material material) { public void removeFuel(org.bukkit.Material material) {
net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material))); net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
} }