SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.18-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
paper-server/nms-patches/net/minecraft/server/dedicated/PropertyManager.patch
View File

@@ -29,12 +29,12 @@
+ }
+ // CraftBukkit end
+
public static Properties loadPropertiesFile(Path path) {
public static Properties loadFromFile(Path path) {
Properties properties = new Properties();
@@ -58,6 +73,11 @@
public void savePropertiesFile(Path path) {
public void store(Path path) {
try {
+ // CraftBukkit start - Don't attempt writing to file if it's read only
+ if (path.toFile().exists() && !path.toFile().canWrite()) {
@@ -45,7 +45,7 @@
try {
@@ -86,7 +106,7 @@
private static <V extends Number> Function<String, V> a(Function<String, V> function) {
private static <V extends Number> Function<String, V> wrapNumberDeserializer(Function<String, V> function) {
return (s) -> {
try {
- return (Number) function.apply(s);
@@ -56,7 +56,7 @@
@@ -105,7 +125,7 @@
@Nullable
private String c(String s) {
private String getStringRaw(String s) {
- return (String) this.properties.get(s);
+ return (String) getOverride(s, this.properties.getProperty(s)); // CraftBukkit
}
@@ -70,25 +70,7 @@
+ return new PropertyManager.EditableProperty(s, v1, function1); // CraftBukkit - decompile error
}
protected <V> V a(String s, Function<String, V> function, UnaryOperator<V> unaryoperator, Function<V, String> function1, V v0) {
@@ -162,7 +182,7 @@
}
protected int getInt(String s, int i) {
- return (Integer) this.a(s, a(Integer::parseInt), (Object) i);
+ return (Integer) this.a(s, a(Integer::parseInt), i); // CraftBukkit - decompile error
}
protected PropertyManager<T>.EditableProperty<Integer> b(String s, int i) {
@@ -174,7 +194,7 @@
}
protected long getLong(String s, long i) {
- return (Long) this.a(s, a(Long::parseLong), (Object) i);
+ return (Long) this.a(s, a(Long::parseLong), i); // CraftBukkit - decompile error
}
protected boolean getBoolean(String s, boolean flag) {
protected <V> V get(String s, Function<String, V> function, UnaryOperator<V> unaryoperator, Function<V, String> function1, V v0) {
@@ -197,7 +217,7 @@
return properties;
}
@@ -108,7 +90,7 @@
this.value = object;
this.serializer = function;
@@ -219,7 +239,7 @@
Properties properties = PropertyManager.this.a();
Properties properties = PropertyManager.this.cloneProperties();
properties.put(this.key, this.serializer.apply(v0));
- return PropertyManager.this.reload(iregistrycustom, properties);