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

Stage 1

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-01 14:40:53 +11:00
parent 90518adcbb
commit ff79e2c7df
77 changed files with 706 additions and 2980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View File

@@ -1,15 +1,15 @@
From f964622c2736fc8d723025d8553ca2ce91b7d67e Mon Sep 17 00:00:00 2001
From 5a795c69a696f3a4817dd22c16cc526937e30410 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index f871b73..0cca057 100644
index 03585b7..086f49e 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -90,6 +90,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
if (this.I() < 0) {
@@ -102,6 +102,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
if (this.J() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
+ // Spigot start
@@ -18,9 +18,9 @@ index f871b73..0cca057 100644
+ org.spigotmc.SpigotConfig.registerCommands();
+ // Spigot end
this.getLogger().info("Generating keypair");
h.info("Generating keypair");
this.a(MinecraftEncryption.b());
@@ -104,7 +109,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -116,7 +121,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
@@ -32,12 +32,12 @@ index f871b73..0cca057 100644
+ // Spigot End
if (!this.getOnlineMode()) {
this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
h.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3924a5c..fbbfa33 100644
index 67247f6..9357eb9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -99,6 +99,7 @@ public abstract class World implements IBlockAccess {
@@ -105,6 +105,7 @@ public abstract class World implements IBlockAccess {
int lastXAccessed = Integer.MIN_VALUE;
int lastZAccessed = Integer.MIN_VALUE;
final Object chunkLock = new Object();
@@ -45,19 +45,19 @@ index 3924a5c..fbbfa33 100644
public CraftWorld getWorld() {
return this.world;
@@ -110,6 +111,7 @@ public abstract class World implements IBlockAccess {
@@ -116,6 +117,7 @@ public abstract class World implements IBlockAccess {
// Changed signature
public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, IConsoleLogManager iconsolelogmanager, ChunkGenerator gen, org.bukkit.World.Environment env) {
// Changed signature - added gen and env
public World(IDataManager idatamanager, String s, WorldSettings worldsettings, WorldProvider worldprovider, MethodProfiler methodprofiler, ChunkGenerator gen, org.bukkit.World.Environment env) {
+ this.spigotConfig = new org.spigotmc.SpigotWorldConfig( s ); // Spigot
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cee0549..62ecc19 100644
index a478ee9..5eefd0d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -216,8 +216,10 @@ public final class CraftServer implements Server {
@@ -231,8 +231,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@@ -70,7 +70,7 @@ index cee0549..62ecc19 100644
}
private File getConfigFile() {
@@ -566,6 +568,7 @@ public final class CraftServer implements Server {
@@ -582,6 +584,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@@ -78,7 +78,7 @@ index cee0549..62ecc19 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -580,11 +583,13 @@ public final class CraftServer implements Server {
@@ -596,11 +599,13 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}