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

Stage 1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-12 14:18:37 +10:00
parent e8dcebdcd5
commit 28ccca81f4
113 changed files with 5701 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,15 @@
From bac9d8f7fd5947eac549d30f8354f34e74919248 Mon Sep 17 00:00:00 2001
From 3f08230723b80338c17bb46ad0eaaa2b4ef184a4 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 1b05fbf..7946703 100644
index 9cef53f..74e28cc 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -109,6 +109,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
if (this.K() < 0) {
if (this.L() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
+ // Spigot start
@@ -18,7 +18,7 @@ index 1b05fbf..7946703 100644
+ org.spigotmc.SpigotConfig.registerCommands();
+ // Spigot end
h.info("Generating keypair");
i.info("Generating keypair");
this.a(MinecraftEncryption.b());
@@ -123,7 +128,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
@@ -32,12 +32,12 @@ index 1b05fbf..7946703 100644
+ // Spigot End
if (!this.getOnlineMode()) {
h.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
i.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 2f514b5..96a3eb8 100644
index 0f97f78..13c0500 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -106,6 +106,7 @@ public abstract class World implements IBlockAccess {
@@ -107,6 +107,7 @@ public abstract class World implements IBlockAccess {
int lastXAccessed = Integer.MIN_VALUE;
int lastZAccessed = Integer.MIN_VALUE;
final Object chunkLock = new Object();
@@ -45,7 +45,7 @@ index 2f514b5..96a3eb8 100644
public CraftWorld getWorld() {
return this.world;
@@ -117,6 +118,7 @@ public abstract class World implements IBlockAccess {
@@ -118,6 +119,7 @@ public abstract class World implements IBlockAccess {
// 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) {
@@ -54,7 +54,7 @@ index 2f514b5..96a3eb8 100644
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 9c81339..aa76abe 100644
index adeab3f..3a72f25 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -309,8 +309,10 @@ public final class CraftServer implements Server {
@@ -72,7 +72,7 @@ index 9c81339..aa76abe 100644
public boolean getCommandBlockOverride(String command) {
@@ -736,6 +738,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
playerList.getProfileBans().load();
+ org.spigotmc.SpigotConfig.init(); // Spigot
for (WorldServer world : console.worlds) {