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

Generic cleanup/reformat.

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot
2011-02-02 00:32:18 +01:00
parent 6a7e7141f8
commit f981a18f45
21 changed files with 55 additions and 71 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

@@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.CraftServer;
/**
* Represents an arrow.
*
*
* @author sk89q
*/
public class CraftArrow extends CraftEntity implements Arrow {

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

@@ -6,7 +6,7 @@ import org.bukkit.entity.Boat;
/**
* A minecart.
*
*
* @author sk89q
*/
public class CraftBoat extends CraftVehicle implements Boat {

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

@@ -6,7 +6,7 @@ import org.bukkit.entity.Egg;
/**
* An egg.
*
*
* @author sk89q
*/
public class CraftEgg extends CraftEntity implements Egg {

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

@@ -37,7 +37,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
// Monsters
else if (entity instanceof EntityMonster) {
if (entity instanceof EntityZombie) {
if (entity instanceof EntityZombie) {
if (entity instanceof EntityPigZombie) { return new CraftPigZombie( server, (EntityPigZombie) entity); }
else { return new CraftZombie( server, (EntityZombie) entity); }
}

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

@@ -7,7 +7,7 @@ import org.bukkit.entity.Fireball;
/**
* A Fireball.
*
*
* @author Cogito
*/
public class CraftFireball extends CraftEntity implements Fireball {

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

@@ -7,7 +7,7 @@ import org.bukkit.entity.Fish;
/**
* A Fish.
*
*
* @author Cogito
*/
public class CraftFish extends CraftEntity implements Fish {

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

@@ -4,7 +4,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityHuman;
import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.CraftServer;

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

@@ -8,12 +8,12 @@ import org.bukkit.craftbukkit.CraftServer;
/**
* Represents an item drop.
*
*
* @author sk89q
*/
public class CraftItemDrop extends CraftEntity implements ItemDrop {
private EntityItem item;
public CraftItemDrop(CraftServer server, EntityItem entity) {
super(server, entity);
this.item = entity;

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

@@ -79,7 +79,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (entity.vehicle == null) {
return false;
}
entity.setPassengerOf(null);
return true;
}
@@ -88,12 +88,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (entity.vehicle == null) {
return null;
}
org.bukkit.entity.Entity vehicle = (entity.vehicle.getBukkitEntity());
if (vehicle instanceof Vehicle) {
return (Vehicle) vehicle;
}
return null;
}

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

@@ -7,7 +7,7 @@ import org.bukkit.entity.PoweredMinecart;
/**
* A powered minecart.
*
*
* @author sk89q
*/
public class CraftPoweredMinecart extends CraftMinecart

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

@@ -6,7 +6,7 @@ import org.bukkit.entity.Snowball;
/**
* A snowball.
*
*
* @author sk89q
*/
public class CraftSnowball extends CraftEntity implements Snowball {

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

@@ -9,12 +9,12 @@ import org.bukkit.entity.StorageMinecart;
/**
* A storage minecart.
*
*
* @author sk89q
*/
public class CraftStorageMinecart extends CraftMinecart implements StorageMinecart {
private CraftInventory inventory;
public CraftStorageMinecart(CraftServer server, EntityMinecart entity) {
super(server, entity);
inventory = new CraftInventory( entity );

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

@@ -6,7 +6,7 @@ import org.bukkit.entity.Vehicle;
/**
* A vehicle.
*
*
* @author sk89q
*/
public abstract class CraftVehicle extends CraftEntity implements Vehicle {
@@ -17,7 +17,7 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle {
public Entity getPassenger() {
return isEmpty() ? null : (getHandle().passenger.getBukkitEntity());
}
public boolean setPassenger(Entity passenger) {
if(passenger instanceof CraftEntity){
((CraftEntity)passenger).getHandle().setPassengerOf(getHandle());
@@ -30,12 +30,12 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle {
public boolean isEmpty() {
return getHandle().passenger == null;
}
public boolean eject() {
if (getHandle().passenger == null) {
return false;
}
getHandle().passenger.setPassengerOf(null);
return true;
}