Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-29 03:31:27 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -158,26 +158,16 @@ public class CraftWorld implements World {
public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) { public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) {
switch (type) { switch (type) {
case BIG_TREE: case BIG_TREE:
return (new WorldGenBigTree()) return new WorldGenBigTree().generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
.generate(delegate, rand,
loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
case BIRCH: case BIRCH:
return (new WorldGenForest()) return new WorldGenForest().generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
.generate(delegate, rand,
loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
case REDWOOD: case REDWOOD:
return (new WorldGenTaiga2()) return new WorldGenTaiga2().generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
.generate(delegate, rand,
loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
case TALL_REDWOOD: case TALL_REDWOOD:
return (new WorldGenTaiga1()) return new WorldGenTaiga1().generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
.generate(delegate, rand,
loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
case TREE: case TREE:
default: default:
return (new WorldGenTrees()) return new WorldGenTrees().generate(delegate, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
.generate(delegate, rand,
loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
} }
} }
@ -257,11 +247,9 @@ public class CraftWorld implements World {
public List<Entity> getEntities() { public List<Entity> getEntities() {
List<Entity> list = new ArrayList<Entity>(); List<Entity> list = new ArrayList<Entity>();
for (Object o : world.b) { for (Object o: world.b) {
if (o instanceof net.minecraft.server.Entity) { if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity)o;
= (net.minecraft.server.Entity)o;
Entity bukkitEntity = mcEnt.getBukkitEntity(); Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null // Assuming that bukkitEntity isn't null
@ -277,11 +265,9 @@ public class CraftWorld implements World {
public List<LivingEntity> getLivingEntities() { public List<LivingEntity> getLivingEntities() {
List<LivingEntity> list = new ArrayList<LivingEntity>(); List<LivingEntity> list = new ArrayList<LivingEntity>();
for (Object o : world.b) { for (Object o: world.b) {
if (o instanceof net.minecraft.server.Entity) { if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity)o;
= (net.minecraft.server.Entity)o;
Entity bukkitEntity = mcEnt.getBukkitEntity(); Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null // Assuming that bukkitEntity isn't null

3
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@ -170,8 +170,7 @@ public class CraftBlock implements Block {
* @return Block at the given face * @return Block at the given face
*/ */
public Block getFace(final BlockFace face, final int distance) { public Block getFace(final BlockFace face, final int distance) {
return getRelative(face.getModX() * distance, face.getModY() * distance, return getRelative(face.getModX() * distance, face.getModY() * distance, face.getModZ() * distance);
face.getModZ() * distance);
} }
/** /**

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 net.minecraft.server.EntityHuman;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer; import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;