Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 00:47:38 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
md_5 2013-03-02 09:09:10 +11:00
parent e2ca1b4c97
commit 1c84a5dd8c
2 changed files with 18 additions and 17 deletions
Show Stats 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

18
CraftBukkit-Patches/0027-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch
View File

@ -1,24 +1,24 @@
From 678a6d96738e6fa5ac3cacfc80ab621d3d99554e Mon Sep 17 00:00:00 2001
From 0c7281c1c384feea1e64b2f4ae234ef473f6f4be Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the
Bukkit version.
---
src/main/java/org/bukkit/craftbukkit/Spigot.java | 19 +
src/main/java/org/bukkit/craftbukkit/Spigot.java | 18 +
src/main/java/org/spigotmc/Metrics.java | 645 +++++++++++++++++++++++
2 files changed, 664 insertions(+)
2 files changed, 663 insertions(+)
create mode 100644 src/main/java/org/spigotmc/Metrics.java
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 572527f..3171411 100644
index 79be52d..e083480 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,10 +1,16 @@
@@ -1,11 +1,16 @@
package org.bukkit.craftbukkit;
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.ArrayList;
import net.minecraft.server.*;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration;
@ -31,7 +31,7 @@ index 572527f..3171411 100644
public class Spigot {
static AxisAlignedBB maxBB = AxisAlignedBB.a(0,0,0,0,0,0);
@@ -12,6 +18,9 @@ public class Spigot {
@@ -13,6 +18,9 @@ public class Spigot {
static AxisAlignedBB animalBB = AxisAlignedBB.a(0,0,0,0,0,0);
static AxisAlignedBB monsterBB = AxisAlignedBB.a(0,0,0,0,0,0);
@ -41,7 +41,7 @@ index 572527f..3171411 100644
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
@@ -34,6 +43,16 @@ public class Spigot {
@@ -35,6 +43,16 @@ public class Spigot {
server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
}
@ -711,5 +711,5 @@ index 0000000..f1690a2
+}
\ No newline at end of file
--
1.8.1.1
1.8.1-rc2