Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@855637f Updated Upstream (CraftBukkit) (#7624)
PaperMC/Paper@5eb61dd Buffer OOB setBlock calls
PaperMC/Paper@7b46444 Properly create profiles with custom name/uuid (#7558)
PaperMC/Paper@a686ff5 Add more missing entity API (#7592)
PaperMC/Paper@993f828 Add TameableDeathMessageEvent (#5392)
PaperMC/Paper@a939d6e Fix generator settings string for flat-type worlds (#7568)
PaperMC/Paper@ab666a4 Deprecating remaining blockkey methods (#7638)
PaperMC/Paper@e7d928a Fix EntityChangeBlockEvent#getBlockData for when sheep eats grass block (#7646)

Pufferfish Changes:
pufferfish-gg/Pufferfish@79b9d86 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@a9bdca9 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9b5f954 Update Simple YAML
pufferfish-gg/Pufferfish@b48e951 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2499975 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@6f42f6f Update readme and use LF because we're not savages
This commit is contained in:
BillyGalbreath
2022-03-22 12:37:21 -05:00
parent b89930ea21
commit 9947768825
12 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,10 +17,10 @@ index ebfaa8d5de5b905bd2dd7778728b8c9939d01252..8153f1aa510474d2f831799a1c149558
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 ce07e8cd0a767a97850380c5e015108f0f1a238b..be20f1450f1b562e4b2112ee16a952313da3b009 100644
index bf09a43ac97305530f7fbd4affd7d13399cd74b4..43319cce012ea8340685000f305b09ff2a5d8d60 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2873,4 +2873,11 @@ public final class CraftServer implements Server {
@@ -2878,4 +2878,11 @@ public final class CraftServer implements Server {
}
// Paper end