Update from upstream SpigotMC

6669d6ecd2b
b2740df50bb
bf71dc61149
fba27a2ea80
92ee7e7f8ec
b28f0d3de23
4beb4ac3918
0ddb6f3dde8
afe301fe892
b8f6402bbbe
This commit is contained in:
Zach Brown
2014-12-07 13:26:30 -06:00
parent 7ae5abba9e
commit 657e0890dc
17 changed files with 16 additions and 32 deletions

View File

@@ -156,7 +156,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public void inactiveTick()
+ {
+ super.inactiveTick();
+ ++this.aT; // Above all the floats
+ ++this.aO; // Above all the floats
+ }
+ // Spigot end
@@ -433,7 +433,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if ( entity instanceof EntityAnimal )
+ {
+ EntityAnimal animal = (EntityAnimal) entity;
+ if ( animal.isBaby() || animal.ce() /*love*/ )
+ if ( animal.isBaby() || animal.cp() /*love*/ )
+ {
+ return true;
+ }