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)

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

Paper Changes:
a7cddc4 Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965)
b1f6e26 Fix mobs not burning from summon command (#5961)
4e2f0be Refactor Anti-Xray and make some fixes to it (#5938)
d50cc01 Make gradle take build number from env vars and add git build info (#5890)
This commit is contained in:
William Blake Galbreath
2021-06-23 16:46:21 -05:00
parent 0babd7cad8
commit 921a000994
13 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0211-Make-lightning-rod-range-configurable.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 48fd3ed38ae5961041276cd7b97bd36b4d3521d0..62cb26584e333b006f84f708a82dc247a7fcce7e 100644
index 40ece868bdab53ee10a9b2251540849732e77f69..378a0feef4f178ddce1e852f07966f377802fa3a 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -846,7 +846,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -18,10 +18,10 @@ index 48fd3ed38ae5961041276cd7b97bd36b4d3521d0..62cb26584e333b006f84f708a82dc247
return optional.map((blockposition1) -> {
return blockposition1.above(1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fb4a745404c7b0c28f4eba8ebfdc87977a132884..728b31e4d59a824536dbb0de3edd88071b22b61a 100644
index 8b5f2de46838e8c7c9e3ca6dfbd72bdbc6d82036..eaa0fcff033d59189475f7c04c5a3f2fc5421469 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -216,6 +216,7 @@ public class PurpurConfig {
@@ -325,6 +325,7 @@ public class PurpurConfig {
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index fb4a745404c7b0c28f4eba8ebfdc87977a132884..728b31e4d59a824536dbb0de3edd8807
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -233,6 +234,7 @@ public class PurpurConfig {
@@ -342,6 +343,7 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);