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

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-09 18:00:58 +11:00
parent 987080283a
commit a6e7c7a91e
46 changed files with 106 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4a6f739f606ead3be6cc77376bbfebaa0fd4128d Mon Sep 17 00:00:00 2001
From 6c24c2f11d8ddf8838037e7bad98339784d72b54 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,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 0194e74..028e4ce 100644
index f850a0f..cd529ec 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 0194e74..028e4ce 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) {