OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move config change into config patch

Browse source
This commit is contained in:
Zach Brown 2016-03-18 16:41:26 -05:00
parent 57be47c2d1
commit bccbc72945
2 changed files with 5 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Spigot-Server-Patches/Configurable-Non-Player-Arrow-Despawn-Rate.patch
View file

@ -9,29 +9,6 @@ diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/m
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ package com.destroystokyo.paper;
import java.util.List;
+import net.minecraft.server.World;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
+import org.spigotmc.SpigotWorldConfig;
public class PaperWorldConfig {
private final String worldName;
+ private final SpigotWorldConfig spigotConfig;
private final YamlConfiguration config;
private boolean verbose;
- public PaperWorldConfig(String worldName) {
+ public PaperWorldConfig(String worldName, SpigotWorldConfig spigotConfig) {
this.worldName = worldName;
+ this.spigotConfig = spigotConfig;
this.config = PaperConfig.config;
init();
}
@@ -0,0 +0,0 @@ public class PaperWorldConfig { @@ -0,0 +0,0 @@ public class PaperWorldConfig {
private void allowLeashingUndeadHorse() { private void allowLeashingUndeadHorse() {
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false); allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
@ -59,17 +36,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.die(); this.die();
} }
} else { } else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
- this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig( worlddata.getName() ); // Paper
+ this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig( worlddata.getName(), this.spigotConfig); // Paper
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
-- --

7
Spigot-Server-Patches/Paper-config-files.patch
View file

@ -144,15 +144,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+import org.bukkit.Bukkit; +import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.configuration.file.YamlConfiguration;
+import org.spigotmc.SpigotWorldConfig;
+ +
+public class PaperWorldConfig { +public class PaperWorldConfig {
+ +
+ private final String worldName; + private final String worldName;
+ private final SpigotWorldConfig spigotConfig;
+ private final YamlConfiguration config; + private final YamlConfiguration config;
+ private boolean verbose; + private boolean verbose;
+ +
+ public PaperWorldConfig(String worldName) { + public PaperWorldConfig(String worldName, SpigotWorldConfig spigotConfig) {
+ this.worldName = worldName; + this.worldName = worldName;
+ this.spigotConfig = spigotConfig;
+ this.config = PaperConfig.config; + this.config = PaperConfig.config;
+ init(); + init();
+ } + }
@ -236,7 +239,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) { protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
+ this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig( worlddata.getName() ); // Paper + this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
this.generator = gen; this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env); this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit