Update to Minecraft 1.16.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-08-12 07:00:00 +10:00
parent 5e5f7f19dc
commit 6a9e00d4b6
208 changed files with 2144 additions and 2455 deletions

View File

@@ -93,8 +93,8 @@
return properties;
}
- protected abstract T reload(Properties properties);
+ protected abstract T reload(Properties properties, OptionSet optionset); // CraftBukkit
- protected abstract T reload(IRegistryCustom iregistrycustom, Properties properties);
+ protected abstract T reload(IRegistryCustom iregistrycustom, Properties properties, OptionSet optionset); // CraftBukkit
public class EditableProperty<V> implements Supplier<V> {
@@ -111,8 +111,8 @@
Properties properties = PropertyManager.this.a();
properties.put(this.b, this.d.apply(v0));
- return PropertyManager.this.reload(properties);
+ return PropertyManager.this.reload(properties, PropertyManager.this.options); // CraftBukkit
- return PropertyManager.this.reload(iregistrycustom, properties);
+ return PropertyManager.this.reload(iregistrycustom, properties, PropertyManager.this.options); // CraftBukkit
}
}
}