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

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 6628f676976dcfee3abcc10ce6bcc2fc30bb7bf0 Mon Sep 17 00:00:00 2001
From 65856207ce4a6941e16aee9636f85f6209b07f85 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 f1caa38..00f9b89 100644
if (!this.getOnlineMode()) {
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 e6bb1d5..4567ee2 100644
index bbf61a3..fab5025 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -103,6 +103,7 @@ public abstract class World implements IBlockAccess {
@@ -106,6 +106,7 @@ public abstract class World implements IBlockAccess {
public boolean pvpMode;
public boolean keepSpawnInMemory = true;
public ChunkGenerator generator;
@@ -45,7 +45,7 @@ index e6bb1d5..4567ee2 100644
public CraftWorld getWorld() {
return this.world;
@@ -114,6 +115,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) {