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

More upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-19 09:15:23 +10:00
parent 1752ff24d2
commit f8ca6ed867
136 changed files with 348 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 45e658422839146811ddc9140d511f785b4c67c8 Mon Sep 17 00:00:00 2001
From 6628f676976dcfee3abcc10ce6bcc2fc30bb7bf0 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 9cef53f..74e28cc 100644
index f1caa38..00f9b89 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
@@ -34,18 +34,18 @@ index 9cef53f..74e28cc 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 0f97f78..13c0500 100644
index e6bb1d5..4567ee2 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 {
int lastXAccessed = Integer.MIN_VALUE;
int lastZAccessed = Integer.MIN_VALUE;
final Object chunkLock = new Object();
@@ -103,6 +103,7 @@ public abstract class World implements IBlockAccess {
public boolean pvpMode;
public boolean keepSpawnInMemory = true;
public ChunkGenerator generator;
+ public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
public CraftWorld getWorld() {
return this.world;
@@ -118,6 +119,7 @@ public abstract class World implements IBlockAccess {
@@ -114,6 +115,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,7 +54,7 @@ index 0f97f78..13c0500 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 f3d9979..9f40d68 100644
index 59010eb..bb1bddf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -316,8 +316,10 @@ public final class CraftServer implements Server {
@@ -297,5 +297,5 @@ index 0000000..961ddb4
+ }
+}
--
1.8.3.2
1.9.1