cursed rebase

This commit is contained in:
Ben Kerllenevich
2021-12-05 09:59:34 -05:00
parent 8336433ff1
commit 7fe89b5a84
167 changed files with 743 additions and 850 deletions

View File

@@ -106,7 +106,7 @@ index c2220d5157d3065a256cd17410760c6aedf24987..729d11569e59e78a0fda67697fe9e27a
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a4024cba49bcd2170206c6f1439e081129be3d15..aa9a7cdc4431a803279bb2325e0eaed7579aafd6 100644
index 310c3e1590465412af6905eab33193c6bf5e5e47..549577e31840ce5f32adb2c0909b915da4362207 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -931,6 +931,7 @@ public final class CraftServer implements Server {
@@ -133,7 +133,7 @@ index a4024cba49bcd2170206c6f1439e081129be3d15..aa9a7cdc4431a803279bb2325e0eaed7
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2547,6 +2550,18 @@ public final class CraftServer implements Server {
@@ -2648,6 +2651,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}