SteamWar/Paper
10
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

18
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@@ -76,7 +76,7 @@ public class CraftEventFactory {
ChunkCoordinates chunkcoordinates = worldServer.getSpawn();
int distanceFromSpawn = (int) Math.max(Math.abs(x - chunkcoordinates.x), Math.abs(z - chunkcoordinates.z));
int distanceFromSpawn = Math.max(Math.abs(x - chunkcoordinates.x), Math.abs(z - chunkcoordinates.z));
return distanceFromSpawn >= spawnSize;
}
@@ -89,8 +89,8 @@ public class CraftEventFactory {
* Block place methods
*/
public static BlockPlaceEvent callBlockPlaceEvent(World world, EntityHuman who, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ) {
CraftWorld craftWorld = ((WorldServer) world).getWorld();
CraftServer craftServer = ((WorldServer) world).getServer();
CraftWorld craftWorld = world.getWorld();
CraftServer craftServer = world.getServer();
Player player = (who == null) ? null : (Player) who.getBukkitEntity();
@@ -236,7 +236,7 @@ public class CraftEventFactory {
*/
public static EntityTameEvent callEntityTameEvent(EntityLiving entity, EntityHuman tamer) {
org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity();
org.bukkit.entity.AnimalTamer bukkitTamer = (tamer != null ? (AnimalTamer) tamer.getBukkitEntity() : null);
org.bukkit.entity.AnimalTamer bukkitTamer = (tamer != null ? tamer.getBukkitEntity() : null);
CraftServer craftServer = (CraftServer) bukkitEntity.getServer();
entity.persistent = true;
@@ -267,7 +267,7 @@ public class CraftEventFactory {
ItemDespawnEvent event = new ItemDespawnEvent(entity, entity.getLocation());
((CraftServer) entity.getServer()).getPluginManager().callEvent(event);
entity.getServer().getPluginManager().callEvent(event);
return event;
}
@@ -329,7 +329,7 @@ public class CraftEventFactory {
}
public static PlayerDeathEvent callPlayerDeathEvent(EntityPlayer victim, List<org.bukkit.inventory.ItemStack> drops, String deathMessage) {
CraftPlayer entity = (CraftPlayer) victim.getBukkitEntity();
CraftPlayer entity = victim.getBukkitEntity();
PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
org.bukkit.World world = entity.getWorld();
Bukkit.getServer().getPluginManager().callEvent(event);
@@ -433,7 +433,7 @@ public class CraftEventFactory {
}
public static FoodLevelChangeEvent callFoodLevelChangeEvent(EntityHuman entity, int level) {
FoodLevelChangeEvent event = new FoodLevelChangeEvent((Player) entity.getBukkitEntity(), level);
FoodLevelChangeEvent event = new FoodLevelChangeEvent(entity.getBukkitEntity(), level);
entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
return event;
}
@@ -498,8 +498,8 @@ public class CraftEventFactory {
player.playerConnection.handleContainerClose(new Packet101CloseWindow(player.activeContainer.windowId));
}
CraftServer server = ((WorldServer) player.world).getServer();
CraftPlayer craftPlayer = (CraftPlayer) player.getBukkitEntity();
CraftServer server = player.world.getServer();
CraftPlayer craftPlayer = player.getBukkitEntity();
player.activeContainer.transferTo(container, craftPlayer);
InventoryOpenEvent event = new InventoryOpenEvent(container.getBukkitView());