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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 57b4275cba2ec0d77c900c51383f3e41375df5b9 Mon Sep 17 00:00:00 2001
From 1c7ef189534ecaf5de7bdcc9db234088c7dc172e 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
@@ -34,7 +34,7 @@ index 30ce5f4..c9bb3a6 100644
if (!this.getOnlineMode()) {
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 f850a0f..cd529ec 100644
index 4a42bb4..5f12d2e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -107,6 +107,7 @@ public abstract class World implements IBlockAccess {
@@ -54,10 +54,10 @@ index f850a0f..cd529ec 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 e4d7a05..d5c1ffb 100644
index e33af61..4d46178 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,8 +231,10 @@ public final class CraftServer implements Server {
@@ -309,8 +309,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@@ -69,8 +69,8 @@ index e4d7a05..d5c1ffb 100644
+ // Spigot End
}
private File getConfigFile() {
@@ -582,6 +584,7 @@ public final class CraftServer implements Server {
public boolean getCommandBlockOverride(String command) {
@@ -723,6 +725,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@@ -78,7 +78,7 @@ index e4d7a05..d5c1ffb 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -596,11 +599,13 @@ public final class CraftServer implements Server {
@@ -737,11 +740,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
@@ -89,9 +89,10 @@ index e4d7a05..d5c1ffb 100644
commandMap.clearCommands();
resetRecipes();
+ org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
int pollCount = 0;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
index 0000000..3dfe4ed