Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00
Code Issues Releases Activity

Update 1.20.6

Browse Source
This commit is contained in:
Dreeam
2024-04-29 21:16:01 -04:00
parent b874f4910e
commit 6626c3f12f
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0008-Gale-configuration.patch
View File

@@ -38,7 +38,7 @@ index 7620c72a4c243cbeea245203ce03a97cbfa7d922..29796a404e210f7864f4b33b3367e025
JSONObject object = new JSONObject();
for (String key : config.getKeys(false)) {
diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
index 4495e1e8930619a0d58745cc55c69a5b574eb698..6684e1932d667f8f29d90eb71e3ac9863832f677 100644
index 96142deb42700f888ea08689ab62c27ef2b881fd..6f1ce6bfca1ab1cb64c6da381329349b7f1153c1 100644
--- a/src/main/java/io/papermc/paper/configuration/Configurations.java
+++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
@@ -7,8 +7,11 @@ import io.papermc.paper.configuration.constraint.Constraint;
@@ -107,10 +107,10 @@ index 4495e1e8930619a0d58745cc55c69a5b574eb698..6684e1932d667f8f29d90eb71e3ac986
+
}
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
index d99489e0216b24d27a19c92a1ce0c10ae10d071f..652487d60a65141832f3d1c8a45cd98e59402f48 100644
index 83a726bcf8b7dce73a361b0d79dbd63a0afc7a12..08ca3427acd2b37140a5af28dd61004188999408 100644
--- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
@@ -320,7 +320,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -321,7 +321,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
}
}
@@ -119,7 +119,7 @@ index d99489e0216b24d27a19c92a1ce0c10ae10d071f..652487d60a65141832f3d1c8a45cd98e
return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess(), level.getGameRules());
}
@@ -423,17 +423,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -424,17 +424,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
}
@@ -137,7 +137,7 @@ index d99489e0216b24d27a19c92a1ce0c10ae10d071f..652487d60a65141832f3d1c8a45cd98e
@Deprecated
public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
YamlConfiguration config = new YamlConfiguration();
@@ -456,9 +445,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -457,9 +446,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
}
// Symlinks are not correctly checked in createDirectories

4
patches/server/0017-Remove-vanilla-profiler.patch
View File

@@ -1765,7 +1765,7 @@ index a7930f9875aa4aca997caaead46ecdc21e5e11d7..64ec94ba2b2ce3884f56c95464384fbc
this.assignProfessionWhenSpawned = false;
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index feb470e8036ecfcd838cff05a0dc1d43cc96ae3c..e927f278e0b5545a25cb9a17bcb4b7b3d79fb8f8 100644
index dc88014c4d9f172cc54e5d77b488128f9ffbc73d..f8c6e2e6ce796196647272bb6e7996f7c7077d4b 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -681,7 +681,6 @@ public class Explosion {
@@ -1776,7 +1776,7 @@ index feb470e8036ecfcd838cff05a0dc1d43cc96ae3c..e927f278e0b5545a25cb9a17bcb4b7b3
List<Pair<ItemStack, BlockPos>> list = new ArrayList();
Util.shuffle(this.toBlow, this.level.random);
@@ -757,7 +756,6 @@ public class Explosion {
@@ -759,7 +758,6 @@ public class Explosion {
Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst());
}