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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-01-31 20:42:29 +00:00
parent 161ec4151b
commit 99ececedb4
23 changed files with 113 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d9baaf527c0e4b45fdd7e79047c75d0be14dc42e Mon Sep 17 00:00:00 2001
From bcd783b672729f05034d1e8f380d05b99cb27ac2 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 3d6aeff..3e3d935 100644
index ff07aa7..adf20d9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -88,7 +88,7 @@ public abstract class Entity {
@@ -21,9 +21,9 @@ index 3d6aeff..3e3d935 100644
public int noDamageTicks;
private boolean justCreated;
protected boolean fireProof;
@@ -111,7 +111,13 @@ public abstract class Entity {
public EnumEntitySize at;
@@ -112,7 +112,13 @@ public abstract class Entity {
public boolean valid; // CraftBukkit
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+ // Spigot start
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@@ -35,7 +35,7 @@ index 3d6aeff..3e3d935 100644
public int getId() {
return this.id;
@@ -138,7 +144,12 @@ public abstract class Entity {
@@ -139,7 +145,12 @@ public abstract class Entity {
this.setPosition(0.0D, 0.0D, 0.0D);
if (world != null) {
this.dimension = world.worldProvider.dimension;
@@ -85,10 +85,10 @@ index 36ed831..7ddca48 100644
super(world);
}
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 4b3e5dd..3fd3de9 100644
index 5887ee8..367bcc9 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -14,7 +14,7 @@ public class EntityArrow extends Entity implements IProjectile {
@@ -15,7 +15,7 @@ public class EntityArrow extends Entity implements IProjectile {
private int f = -1;
private Block g;
private int h;
@@ -477,5 +477,5 @@ index 49a5b7a..1d95207 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0