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

Cleanup comments, formatting, etc

Browse Source 
By: Travis Watkins <amaranth@ubuntu.com>
This commit is contained in:
CraftBukkit/Spigot
2013-03-24 23:22:32 -05:00
parent f0a4f87f80
commit 56947c94a9
40 changed files with 110 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java
View File

@@ -54,12 +54,12 @@ public class CraftAgeable extends CraftCreature implements Ageable {
setAge(6000);
}
}
@Override
public EntityAgeable getHandle() {
return (EntityAgeable) entity;
}
@Override
public String toString() {
return "CraftAgeable";

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@@ -187,7 +187,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public World getWorld() {
return ((WorldServer) entity.world).getWorld();
return entity.world.getWorld();
}
public boolean teleport(Location location) {
@@ -265,7 +265,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public org.bukkit.entity.Entity getPassenger() {
return isEmpty() ? null : (CraftEntity) getHandle().passenger.getBukkitEntity();
return isEmpty() ? null : getHandle().passenger.getBukkitEntity();
}
public boolean setPassenger(org.bukkit.entity.Entity passenger) {

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
View File

@@ -15,7 +15,7 @@ public class CraftFish extends AbstractProjectile implements Fish {
public LivingEntity getShooter() {
if (getHandle().owner != null) {
return (LivingEntity) getHandle().owner.getBukkitEntity();
return getHandle().owner.getBukkitEntity();
}
return null;

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -366,7 +366,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// To = Players new Location if Teleport is Successful
Location to = location;
// Create & Call the Teleport Event.
PlayerTeleportEvent event = new PlayerTeleportEvent((Player) this, from, to, cause);
PlayerTeleportEvent event = new PlayerTeleportEvent(this, from, to, cause);
server.getPluginManager().callEvent(event);
// Return False to inform the Plugin that the Teleport was unsuccessful/cancelled.

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java
View File

@@ -12,7 +12,7 @@ public abstract class CraftProjectile extends AbstractProjectile implements Proj
}
public LivingEntity getShooter() {
if (getHandle().getShooter() instanceof EntityLiving) {
if (getHandle().getShooter() != null) {
return (LivingEntity) getHandle().getShooter().getBukkitEntity();
}