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-05-27 17:40:02 +10:00
parent 955a0fb081
commit 23c4e709bc
10 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0017-Entity-Activation-Range.patch
View File

@@ -1,4 +1,4 @@
From 7ee37a400f775d11d94b1382912ea39316871ff5 Mon Sep 17 00:00:00 2001
From a49d646e20683324316f385e6fd2d3614f425a48 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
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d817369..0b6e9cf 100644
index 0999562..e966314 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -91,7 +91,7 @@ public abstract class Entity {
@@ -137,12 +137,12 @@ index a228a2c..0a81006 100644
super(world);
this.a(0.25F, 0.25F);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f90e2a3..6c77253 100644
index b3bf43a..a180c89 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -78,6 +78,13 @@ public abstract class EntityLiving extends Entity {
public int expToDrop;
@@ -80,6 +80,13 @@ public abstract class EntityLiving extends Entity {
public int maxAirTicks = 300;
ArrayList<org.bukkit.inventory.ItemStack> drops = null;
// CraftBukkit end
+ // Spigot start
+ public void inactiveTick()