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

Fix formatting.

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot
2012-01-14 23:02:10 +01:00
parent 62e770d489
commit 7c345d4d82
39 changed files with 266 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
}
@Override
public EntityArrow getHandle(){
public EntityArrow getHandle() {
return (EntityArrow) entity;
}

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

@@ -177,7 +177,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
List<Entity> notchEntityList = entity.world.getEntities(entity, entity.boundingBox.grow(x, y, z));
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
for (Entity e: notchEntityList) {
for (Entity e : notchEntityList) {
bukkitEntityList.add(e.getBukkitEntity());
}
return bukkitEntityList;
@@ -269,7 +269,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
CraftPlayer result = players.get(entity.name);
if (result == null) {
result = new CraftPlayer((CraftServer)Bukkit.getServer(), entity);
result = new CraftPlayer((CraftServer) Bukkit.getServer(), entity);
players.put(entity.name, result);
} else {
result.setHandle(entity);

1
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityExperienceOrb;

1
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.craftbukkit.entity;
import java.util.Set;

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@@ -47,7 +47,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().setHealth(health);
}
public int getMaxHealth() {
return getHandle().getMaxHealth();
}
@@ -173,9 +173,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
DamageSource reason = DamageSource.GENERIC;
if (source instanceof HumanEntity) {
reason = DamageSource.playerAttack(((CraftHumanEntity)source).getHandle());
reason = DamageSource.playerAttack(((CraftHumanEntity) source).getHandle());
} else if (source instanceof LivingEntity) {
reason = DamageSource.mobAttack(((CraftLivingEntity)source).getHandle());
reason = DamageSource.mobAttack(((CraftLivingEntity) source).getHandle());
}
entity.damageEntity(reason, amount);
@@ -226,6 +226,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public Player getKiller() {
return getHandle().killer == null ? null : (Player)getHandle().killer.getBukkitEntity();
return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
}
}

1
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java
View File

@@ -1,6 +1,5 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityMagmaCube;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.MagmaCube;

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

@@ -102,7 +102,7 @@ public class CraftPainting extends CraftEntity implements Painting {
}
private void update() {
WorldServer world = ((CraftWorld)getWorld()).getHandle();
WorldServer world = ((CraftWorld) getWorld()).getHandle();
EntityPainting painting = new EntityPainting(world);
painting.x = getHandle().x;
painting.y = getHandle().y;

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

@@ -76,7 +76,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public boolean isOnline() {
for (Object obj: server.getHandle().players) {
for (Object obj : server.getHandle().players) {
EntityPlayer player = (EntityPlayer) obj;
if (player.name.equalsIgnoreCase(getName())) {
return true;
@@ -173,7 +173,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (!(obj instanceof OfflinePlayer)) {
return false;
}
OfflinePlayer other = (OfflinePlayer)obj;
OfflinePlayer other = (OfflinePlayer) obj;
if ((this.getName() == null) || (other.getName() == null)) {
return false;
}
@@ -485,7 +485,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public int getExperience() {
return (int)(getExp() * 100);
return (int) (getExp() * 100);
}
public void setExperience(int exp) {
@@ -493,7 +493,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public int getLevel() {
return (int)getHandle().expLevel;
return (int) getHandle().expLevel;
}
public void setLevel(int level) {
@@ -655,7 +655,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
for (String channel : listening) {
try {
stream.write(channel.getBytes("UTF8"));
stream.write((byte)0);
stream.write((byte) 0);
} catch (IOException ex) {
Logger.getLogger(CraftPlayer.class.getName()).log(Level.SEVERE, "Could not send Plugin Channel REGISTER to " + getName(), ex);
}

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

@@ -13,7 +13,7 @@ public abstract class CraftProjectile extends AbstractProjectile implements Proj
public LivingEntity getShooter() {
if (getHandle().shooter instanceof EntityLiving) {
return (LivingEntity)getHandle().shooter.getBukkitEntity();
return (LivingEntity) getHandle().shooter.getBukkitEntity();
}
return null;
@@ -21,7 +21,7 @@ public abstract class CraftProjectile extends AbstractProjectile implements Proj
public void setShooter(LivingEntity shooter) {
if (shooter instanceof CraftLivingEntity) {
getHandle().shooter = (EntityLiving)((CraftLivingEntity)shooter).entity;
getHandle().shooter = (EntityLiving) ((CraftLivingEntity) shooter).entity;
}
}

1
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWeather.java
View File

@@ -1,4 +1,3 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityWeather;

6
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
View File

@@ -74,6 +74,7 @@ public class CraftWolf extends CraftAnimals implements Wolf {
/**
* The owner's name is how MC knows and persists the Wolf's owner. Since we choose to instead use an AnimalTamer, this functionality
* is used only as a backup. If the animal tamer is a player, we will store their name, otherwise we store an empty string.
*
* @return the owner's name, if they are a player; otherwise, the empty string or null.
*/
String getOwnerName() {
@@ -87,6 +88,7 @@ public class CraftWolf extends CraftAnimals implements Wolf {
/**
* Only used internally at the moment, and there to set the path to null (that is stop the thing from running around)
* TODO use this later to extend the API, when we have Path classes in Bukkit
*
* @param pathentity currently the MC defined PathEntity class. Should be replaced with an API interface at some point.
*/
private void setPath(PathEntity pathentity) {
@@ -99,12 +101,10 @@ public class CraftWolf extends CraftAnimals implements Wolf {
private void playTamingAnimation(boolean successful){
getHandle().a(successful);
}
*/
*/
@Override
public EntityWolf getHandle() {
// It's somewhat easier to override this here, as many internal methods rely on EntityWolf specific methods.
// Doing this has no impact on anything outside this class.
return (EntityWolf) entity;
}