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

Fix compilation issues (#1530)

Browse Source
This commit is contained in:
Krakenied
2024-06-17 01:52:10 +02:00
committed by GitHub
parent 6e1147f1ac
commit c9917352de
306 changed files with 1065 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0166-Make-lightning-rod-range-configurable.patch
View File

@@ -5,10 +5,10 @@ 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 e8e5704937350cc65ae24980c56a3a898debd4f2..b8d80e04eea132d9671026e93e7c666d33dfeb25 100644
index 97e18801ae774d4e7b5154912a1a82810fc3d0b9..b2f066db2ac90ba53e0cc3c995316f49f7bc62ea 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -978,7 +978,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -977,7 +977,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
return holder.is(PoiTypes.LIGHTNING_ROD);
}, (blockposition1) -> {
return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;
@@ -18,10 +18,10 @@ index e8e5704937350cc65ae24980c56a3a898debd4f2..b8d80e04eea132d9671026e93e7c666d
return optional.map((blockposition1) -> {
return blockposition1.above(1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 04be61a14d33dad94d7193c13ccefdd05a4620d0..2e886467a77857bcbc156443068ef4b19815e8df 100644
index 7b78896803290d89cbdcbc2d68eccc97d07a0fba..45e75e35e6fb6507fc1322267c05a7a41e0320b8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -270,6 +270,7 @@ public class PurpurConfig {
@@ -272,6 +272,7 @@ public class PurpurConfig {
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index 04be61a14d33dad94d7193c13ccefdd05a4620d0..2e886467a77857bcbc156443068ef4b1
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -303,6 +304,7 @@ public class PurpurConfig {
@@ -305,6 +306,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);