More stuff

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-01 16:00:50 +11:00
parent 6feb9d719f
commit e72250e21a
6 changed files with 26 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
From c501d75e14fe07c06bee42ce7781d2c873b5970b Mon Sep 17 00:00:00 2001
From a748467688abd31e2a1fee9f5f2e5339ff99c5b2 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
@@ -116,10 +116,10 @@ index 75b1ec1..a61001d 100644
public EntityLiving(World world) {
super(world);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d89ef3c..f53e51d 100644
index 60c78d2..3108628 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1255,6 +1255,7 @@ public abstract class World implements IBlockAccess {
@@ -1247,6 +1247,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
@@ -127,7 +127,7 @@ index d89ef3c..f53e51d 100644
timings.entityTick.startTiming(); // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1415,7 +1416,11 @@ public abstract class World implements IBlockAccess {
@@ -1407,7 +1408,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
byte b0 = 32;
@@ -156,7 +156,7 @@ index 8340c13..541dfe4 100644
public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
new file mode 100644
index 0000000..9285a0d
index 0000000..db4c927
--- /dev/null
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +1,296 @@
@@ -396,14 +396,14 @@ index 0000000..9285a0d
+ {
+ return true;
+ }
+ if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).bU() /* Getter for first boolean */ )
+ if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).bY() /* Getter for first boolean */ )
+ {
+ return true;
+ }
+ if ( entity instanceof EntityAnimal )
+ {
+ EntityAnimal animal = (EntityAnimal) entity;
+ if ( animal.isBaby() || animal.bY() /*love*/ )
+ if ( animal.isBaby() || animal.cc() /*love*/ )
+ {
+ return true;
+ }