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

When I add code to prevent server crashes, I expect it to stay there.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-02 09:09:10 +11:00
parent 6d3ec813ed
commit c7f16ebbea
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CraftBukkit-Patches/0024-Entity-Activation-Range.patch
View File

@@ -1,4 +1,4 @@
From b15c950c96a0321950dcb86edf666dd844a01765 Mon Sep 17 00:00:00 2001
From 8a22e56519a1b35e512bbb7f80070bcb9e67e9c9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@@ -13,10 +13,10 @@ This change can have dramatic impact on gameplay if configured too low. Balance
src/main/java/net/minecraft/server/EntityItem.java | 5 +-
src/main/java/net/minecraft/server/World.java | 14 +-
.../java/org/bukkit/craftbukkit/CraftWorld.java | 15 +-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 218 +++++++++++++++++++++
src/main/java/org/bukkit/craftbukkit/Spigot.java | 219 +++++++++++++++++++++
.../java/org/bukkit/craftbukkit/SpigotTimings.java | 3 +
src/main/resources/configurations/bukkit.yml | 3 +
8 files changed, 262 insertions(+), 11 deletions(-)
8 files changed, 263 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index bf9108a..8cbe086 100644
@@ -178,12 +178,13 @@ index 21bd64a..33df602 100644
public Block getBlockAt(int x, int y, int z) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index ad65bca..32954fa 100644
index ad65bca..79be52d 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,9 +1,16 @@
@@ -1,9 +1,17 @@
package org.bukkit.craftbukkit;
+import java.util.ArrayList;
+import net.minecraft.server.*;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -198,7 +199,7 @@ index ad65bca..32954fa 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -26,5 +33,216 @@ public class Spigot {
@@ -26,5 +34,216 @@ public class Spigot {
if (server.chunkGCPeriod == 0) {
server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
}
@@ -283,7 +284,7 @@ index ad65bca..32954fa 100644
+ maxRange = Math.max(maxRange, miscActivationRange);
+ maxRange = Math.min((world.getWorld().viewDistance << 4) - 8, maxRange);
+
+ for (Entity player : (List<Entity>) world.players) {
+ for (Entity player : new ArrayList<Entity>(world.players)) {
+
+ player.activatedTick = MinecraftServer.currentTick;
+ growBB(maxBB, player.boundingBox, maxRange, 256, maxRange);
@@ -444,5 +445,5 @@ index 78e9a66..e568bf6 100644
growth-chunks-per-tick: 1000
world_nether:
--
1.8.1.1
1.8.1-rc2