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

Update Spigot to Minecraft 1.6.2

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-09 10:31:10 +10:00
parent 0485474219
commit 6fe8638955
25 changed files with 140 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CraftBukkit-Patches/0021-Entity-Activation-Range.patch
View File

@@ -1,4 +1,4 @@
From 0d4073efa46306a7f80b9707cf0592201ecb6d95 Mon Sep 17 00:00:00 2001
From 0b1f4f7d9d57f2c04277b404fe0bc53f22fb39d2 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 fd62164..46eb430 100644
index e095ae0..4a769ed 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 {
@@ -87,7 +87,7 @@ index 5ba19f3..4c73a5f 100644
super(world);
}
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index affeca6..f44f5e2 100644
index 65e7a88..7015f21 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 {
@@ -100,10 +100,10 @@ index affeca6..f44f5e2 100644
public int shake;
public Entity shooter;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0adbfcd..a01106c 100644
index 45b1410..a65567d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -77,6 +77,13 @@ public abstract class EntityLiving extends Entity {
@@ -78,6 +78,13 @@ public abstract class EntityLiving extends Entity {
public int expToDrop;
public int maxAirTicks = 300;
// CraftBukkit end
@@ -118,7 +118,7 @@ index 0adbfcd..a01106c 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 fd76af0..039ba6e 100644
index 6206167..211127b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1276,6 +1276,7 @@ public abstract class World implements IBlockAccess {
@@ -161,7 +161,7 @@ index f6e507e..4328ecf 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..71d8e59
index 0000000..9285a0d
--- /dev/null
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +1,296 @@
@@ -401,14 +401,14 @@ index 0000000..71d8e59
+ {
+ return true;
+ }
+ if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).bQ() /* Getter for first boolean */ )
+ if ( entity instanceof EntityVillager && ( (EntityVillager) entity ).bU() /* Getter for first boolean */ )
+ {
+ return true;
+ }
+ if ( entity instanceof EntityAnimal )
+ {
+ EntityAnimal animal = (EntityAnimal) entity;
+ if ( animal.isBaby() || animal.bU() /*love*/ )
+ if ( animal.isBaby() || animal.bY() /*love*/ )
+ {
+ return true;
+ }