Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.5

Browse Source
This commit is contained in:
Nate Mortensen
2014-03-20 22:26:30 -06:00
committed by EvilSeph
parent afb3511a4a
commit 385ace970e
206 changed files with 2670 additions and 2679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minecraft/server/ItemMonsterEgg.java
View File

@@ -19,7 +19,8 @@ public class ItemMonsterEgg extends Item {
}
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) {
if (world.isStatic || itemstack.getData() == 48 || itemstack.getData() == 49 || itemstack.getData() == 63 || itemstack.getData() == 64) { // CraftBukkit
// CraftBukkit - check ItemStack data
if (world.isStatic || itemstack.getData() == 48 || itemstack.getData() == 49 || itemstack.getData() == 63 || itemstack.getData() == 64) {
return true;
} else {
Block block = world.getType(i, j, k);
@@ -98,7 +99,7 @@ public class ItemMonsterEgg extends Item {
public static Entity spawnCreature(World world, int i, double d0, double d1, double d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
// CraftBukkit end
if (!EntityTypes.a.containsKey(Integer.valueOf(i))) {
if (!EntityTypes.eggInfo.containsKey(Integer.valueOf(i))) {
return null;
} else {
Entity entity = null;
@@ -109,8 +110,8 @@ public class ItemMonsterEgg extends Item {
EntityInsentient entityinsentient = (EntityInsentient) entity;
entity.setPositionRotation(d0, d1, d2, MathHelper.g(world.random.nextFloat() * 360.0F), 0.0F);
entityinsentient.aP = entityinsentient.yaw;
entityinsentient.aN = entityinsentient.yaw;
entityinsentient.aO = entityinsentient.yaw;
entityinsentient.aM = entityinsentient.yaw;
entityinsentient.a((GroupDataEntity) null);
world.addEntity(entity, spawnReason); // CraftBukkit
entityinsentient.r();