twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-31 04:13:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update for 1.6.5

Browse Source
This commit is contained in:
Erik Broes
2011-05-28 22:50:08 +02:00
committed by EvilSeph
parent 9ec5d8b5df
commit 6dbd710bbf
41 changed files with 747 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
View File

@@ -19,7 +19,7 @@ public class CraftCreeper extends CraftMonster implements Creeper {
}
public boolean isPowered() {
return getHandle().X().a(17) == 1;
return getHandle().Z().a(17) == 1;
}
public void setPowered(boolean powered) {
@@ -32,14 +32,14 @@ public class CraftCreeper extends CraftMonster implements Creeper {
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
getHandle().X().b(17, (byte)1);
getHandle().Z().b(17, (byte)1);
}
} else {
CreeperPowerEvent event = new CreeperPowerEvent(entity, CreeperPowerEvent.PowerCause.SET_OFF);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
getHandle().X().b(17, (byte)0);
getHandle().Z().b(17, (byte)0);
}
}

23
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -172,25 +172,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
EntityPlayer entity = getHandle();
if (oldWorld != newWorld) {
entity.dimension = newWorld.dimension;
entity.netServerHandler.sendPacket(new Packet9Respawn((byte) location.getWorld().getEnvironment().getId()));
oldWorld.removeEntity(entity);
entity.dead = false;
entity.setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
if (entity.Q()) {
oldWorld.entityJoinedWorld(entity, false);
newWorld.addEntity(entity);
entity.setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
newWorld.entityJoinedWorld(entity, false);
}
manager.a(entity);
entity.netServerHandler.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
entity.a((World)newWorld);
manager.a(entity, newWorld);
entity.a(entity.defaultContainer);
this.sendMessage("Multiworld teleporting disabled in this build. Nether works");
// this.entity = manager.a(entity, newWorld.dimension, false);
return true;
} else {
return entity.netServerHandler.teleport(location);
@@ -214,7 +197,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void updateInventory() {
getHandle().syncInventory();
getHandle().a(getHandle().activeContainer);
}
public void setSleepingIgnored(boolean isSleeping) {

2
src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
View File

@@ -35,7 +35,7 @@ public class CraftWolf extends CraftAnimals implements Wolf {
}
public boolean isTamed() {
return getHandle().m_();
return getHandle().A();
}
public void setTamed(boolean tame) {