twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-31 04:02:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Upstream merge, lots of conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 113ad2d77cebbed4a6dbbcb7cec0e476f494b17b Mon Sep 17 00:00:00 2001
From 45a5a5488e6357d94cc9f197e876d8d1a86f81bb 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 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 bbf61a3..fab5025 100644
index eb5da2a..c6ba026 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 {
@@ -45,7 +45,7 @@ index bbf61a3..fab5025 100644
public CraftWorld getWorld() {
return this.world;
@@ -117,6 +118,7 @@ public abstract class World implements IBlockAccess {
@@ -121,6 +122,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) {