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

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@67066cd [ci-skip] remove unused config option
This commit is contained in:
github-actions[bot]
2023-03-15 05:24:49 +00:00
parent aabc40f9b9
commit 29e8199c39
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.upstream-data
View File

@@ -1,2 +1,2 @@
purpurCommit = 72b75798c52243bbdb79c3291e6def181078d658
purpurCommit = 67066cdd463e6e2d02dd26ec9418178d074abd41
pufferfishCommit = 47c34ca04781a2a9d26ba8818146341339d2414f

2
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 15 Mar 2023 04:24:24 +0000
Date: Wed, 15 Mar 2023 05:19:29 +0000
Subject: [PATCH] Pufferfish API Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>

2
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 15 Mar 2023 04:26:22 +0000
Date: Wed, 15 Mar 2023 05:21:29 +0000
Subject: [PATCH] Purpur API Changes
Original: PurpurMC

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

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 15 Mar 2023 04:24:24 +0000
Date: Wed, 15 Mar 2023 05:19:29 +0000
Subject: [PATCH] Pufferfish Server Changes
Original: Kevin Raneri <kevin.raneri@gmail.com>

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

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 15 Mar 2023 04:26:22 +0000
Date: Wed, 15 Mar 2023 05:21:28 +0000
Subject: [PATCH] Purpur Server Changes
Original: PurpurMC
@@ -22018,10 +22018,10 @@ index 0000000000000000000000000000000000000000..3e6d3b71931a18263eff11841cb4e916
+}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6a9485912e5ca6a65dde62cc4d9fe033b3c55b7
index 0000000000000000000000000000000000000000..4c6853f2f8171e2b9fd78ba5e6bb5fe63cdeb41d
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -0,0 +1,3189 @@
@@ -0,0 +1,3185 @@
+package org.purpurmc.purpur;
+
+//import gg.pufferfish.pufferfish.PufferfishConfig;
@@ -22974,12 +22974,10 @@ index 0000000000000000000000000000000000000000..b6a9485912e5ca6a65dde62cc4d9fe03
+ snowOnBlueIce = getBoolean("blocks.blue_ice.allow-snow-formation", snowOnBlueIce);
+ }
+
+ public boolean lavaInfinite = false;
+ public int lavaInfiniteRequiredSources = 2;
+ public int lavaSpeedNether = 10;
+ public int lavaSpeedNotNether = 30;
+ private void lavaSettings() {
+ lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite);
+ lavaInfiniteRequiredSources = getInt("blocks.lava.infinite-required-sources", lavaInfiniteRequiredSources);
+ lavaSpeedNether = getInt("blocks.lava.speed.nether", lavaSpeedNether);
+ lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
@@ -23091,10 +23089,8 @@ index 0000000000000000000000000000000000000000..b6a9485912e5ca6a65dde62cc4d9fe03
+ turtleEggsTramplingFeatherFalling = getBoolean("blocks.turtle_egg.feather-fall-distance-affects-trampling", turtleEggsTramplingFeatherFalling);
+ }
+
+ public boolean waterInfinite = true;
+ public int waterInfiniteRequiredSources = 2;
+ private void waterSources() {
+ waterInfinite = getBoolean("blocks.water.infinite-source", waterInfinite);
+ waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources);
+ }
+

4
patches/server/0006-Plazma-Optimize-Default-Configurations.patch
View File

@@ -262,7 +262,7 @@ index f509c9b9d72710360046679fa26eb594eeffca92..b3e2ee83b3d3891899b4395ec9f97ca1
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b6a9485912e5ca6a65dde62cc4d9fe033b3c55b7..f48fe55c0aa086122f27b141a4bc03e154539aa9 100644
index 4c6853f2f8171e2b9fd78ba5e6bb5fe63cdeb41d..18a7ae3c30b83e971c968691c7054dad7f97b6f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -422,7 +422,7 @@ public class PurpurWorldConfig {
@@ -274,7 +274,7 @@ index b6a9485912e5ca6a65dde62cc4d9fe033b3c55b7..f48fe55c0aa086122f27b141a4bc03e1
public boolean teleportOnNetherCeilingDamage = false;
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
@@ -3026,7 +3026,7 @@ public class PurpurWorldConfig {
@@ -3022,7 +3022,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;