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

Update to 1.7.5

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,15 @@
From e93ba24d7e89f1a942518b90ae962db720e0a48b Mon Sep 17 00:00:00 2001
From 3424b3f7065054cdd942eb6ad56d86eab89e672a 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 30ce5f4..c9bb3a6 100644
index 1b05fbf..7946703 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.J() < 0) {
if (this.K() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
+ // Spigot start
@@ -34,10 +34,10 @@ 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 4a42bb4..5f12d2e 100644
index 2f514b5..96a3eb8 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 {
@@ -106,6 +106,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 4a42bb4..5f12d2e 100644
public CraftWorld getWorld() {
return this.world;
@@ -118,6 +119,7 @@ public abstract class World implements IBlockAccess {
@@ -117,6 +118,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,10 +54,10 @@ index 4a42bb4..5f12d2e 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 e33af61..4d46178 100644
index 7aedef4..50a27fb 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 {
@@ -310,8 +310,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@@ -70,7 +70,7 @@ index e33af61..4d46178 100644
}
public boolean getCommandBlockOverride(String command) {
@@ -723,6 +725,7 @@ public final class CraftServer implements Server {
@@ -726,6 +728,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@@ -78,7 +78,7 @@ index e33af61..4d46178 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -737,11 +740,14 @@ public final class CraftServer implements Server {
@@ -740,11 +743,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
@@ -297,5 +297,5 @@ index 0000000..961ddb4
+ }
+}
--
1.8.3.2
1.8.5.2.msysgit.0