Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-14 19:42:20 +01:00
Code Issues Projects Releases Wiki Activity

Whitespace + general cleanup

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot 2011-05-14 16:29:42 +02:00
parent 045c14c210
commit 776b9efd3e
21 changed files with 101 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,10 +60,10 @@ public class CraftChunk implements Chunk {
public Block getBlock(int x, int y, int z) { public Block getBlock(int x, int y, int z) {
int pos = (x & 0xF) << 11 | (z & 0xF) << 7 | (y & 0x7F); int pos = (x & 0xF) << 11 | (z & 0xF) << 7 | (y & 0x7F);
Block block = this.cache.get( pos ); Block block = this.cache.get(pos);
if (block == null) { if (block == null) {
Block newBlock = new CraftBlock( this, (getX() << 4) | (x & 0xF), y & 0x7F, (getZ() << 4) | (z & 0xF) ); Block newBlock = new CraftBlock(this, (getX() << 4) | (x & 0xF), y & 0x7F, (getZ() << 4) | (z & 0xF));
Block oldBlock = this.cache.put( pos, newBlock ); Block oldBlock = this.cache.put(pos, newBlock);
if(oldBlock == null) { if(oldBlock == null) {
block = newBlock; block = newBlock;
} else { } else {

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

@ -267,7 +267,7 @@ public final class CraftServer implements Server {
// NOTE: Should only be called from MinecraftServer.b() // NOTE: Should only be called from MinecraftServer.b()
public boolean dispatchCommand(CommandSender sender, ServerCommand serverCommand) { public boolean dispatchCommand(CommandSender sender, ServerCommand serverCommand) {
if ( commandMap.dispatch(sender, serverCommand.command) ) { if (commandMap.dispatch(sender, serverCommand.command)) {
return true; return true;
} }
return console.consoleCommandHandler.handle(serverCommand); return console.consoleCommandHandler.handle(serverCommand);
@ -279,7 +279,7 @@ public final class CraftServer implements Server {
return true; return true;
} }
if ( ! sender.isOp() ) { if (!sender.isOp()) {
return false; return false;
} }
@ -457,7 +457,7 @@ public final class CraftServer implements Server {
private final String prefix; private final String prefix;
CommandListener(CommandSender commandSender) { CommandListener(CommandSender commandSender) {
this.commandSender = commandSender; this.commandSender = commandSender;
String[] parts = commandSender.getClass().getName().split( "\\." ); String[] parts = commandSender.getClass().getName().split("\\.");
this.prefix = parts[parts.length-1]; this.prefix = parts[parts.length-1];
} }

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

@ -47,13 +47,13 @@ public class CraftWorld implements World {
server.addWorld(this); server.addWorld(this);
} }
public void preserveChunk( CraftChunk chunk ) { public void preserveChunk(CraftChunk chunk) {
chunk.breakLink(); chunk.breakLink();
unloadedChunks.put( (chunk.getX() << 16) + chunk.getZ(), chunk ); unloadedChunks.put((chunk.getX() << 16) + chunk.getZ(), chunk);
} }
public Chunk popPreservedChunk( int x, int z ) { public Chunk popPreservedChunk(int x, int z) {
return unloadedChunks.remove( (x << 16) + z ); return unloadedChunks.remove((x << 16) + z);
} }
public Block getBlockAt(int x, int y, int z) { public Block getBlockAt(int x, int y, int z) {
@ -97,7 +97,7 @@ public class CraftWorld implements World {
} }
public boolean isChunkLoaded(int x, int z) { public boolean isChunkLoaded(int x, int z) {
return provider.isChunkLoaded( x, z ); return provider.isChunkLoaded(x, z);
} }
public Chunk[] getLoadedChunks() { public Chunk[] getLoadedChunks() {
@ -285,7 +285,7 @@ public class CraftWorld implements World {
EntityItem entity = new EntityItem(world, loc.getX(), loc.getY(), loc.getZ(), stack); EntityItem entity = new EntityItem(world, loc.getX(), loc.getY(), loc.getZ(), stack);
entity.pickupDelay = 10; entity.pickupDelay = 10;
world.addEntity(entity); world.addEntity(entity);
//TODO this is inconsistent with how Entity.getBukkitEntity() works. // TODO this is inconsistent with how Entity.getBukkitEntity() works.
// However, this entity is not at the moment backed by a server entity class so it may be left. // However, this entity is not at the moment backed by a server entity class so it may be left.
return new CraftItem(world.getServer(), entity); return new CraftItem(world.getServer(), entity);
} }
@ -433,7 +433,7 @@ public class CraftWorld implements World {
public void setFullTime(long time) { public void setFullTime(long time) {
world.setTime(time); world.setTime(time);
//Forces the client to update to the new time immediately // Forces the client to update to the new time immediately
for (Player p: getPlayers()) { for (Player p: getPlayers()) {
CraftPlayer cp = (CraftPlayer) p; CraftPlayer cp = (CraftPlayer) p;
cp.getHandle().netServerHandler.sendPacket(new Packet4UpdateTime(time)); cp.getHandle().netServerHandler.sendPacket(new Packet4UpdateTime(time));

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

@ -245,11 +245,10 @@ public class CraftBlock implements Block {
BlockFace[] values = BlockFace.values(); BlockFace[] values = BlockFace.values();
for (BlockFace face : values) { for (BlockFace face : values) {
if ( if ((this.getX() + face.getModX() == block.getX()) &&
(this.getX() + face.getModX() == block.getX()) && (this.getY() + face.getModY() == block.getY()) &&
(this.getY() + face.getModY() == block.getY()) && (this.getZ() + face.getModZ() == block.getZ())
(this.getZ() + face.getModZ() == block.getZ()) ) {
) {
return face; return face;
} }
} }
@ -302,7 +301,7 @@ public class CraftBlock implements Block {
case SOUTH: case SOUTH:
return 5; return 5;
default: default:
return 7; //Good as anything here, but technically invalid return 7; // Good as anything here, but technically invalid
} }
} }
@ -371,7 +370,7 @@ public class CraftBlock implements Block {
} }
@Override @Override
public boolean equals( Object o ) { public boolean equals(Object o) {
return this == o; return this == o;
} }

4
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View File

@ -34,8 +34,8 @@ public class CraftBlockState implements BlockState {
createData(block.getData()); createData(block.getData());
} }
public static BlockState getBlockState( net.minecraft.server.World world, int x, int y, int z) { public static BlockState getBlockState(net.minecraft.server.World world, int x, int y, int z) {
return new CraftBlockState( ((WorldServer) world).getWorld().getBlockAt(x, y, z) ); return new CraftBlockState(((WorldServer) world).getWorld().getBlockAt(x, y, z));
} }
/** /**

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

@ -20,62 +20,62 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity; this.entity = entity;
} }
public static CraftEntity getEntity( CraftServer server, Entity entity) { public static CraftEntity getEntity(CraftServer server, Entity entity) {
/** /**
* Order is *EXTREMELY* important -- keep it right! =D * Order is *EXTREMELY* important -- keep it right! =D
*/ */
if (entity instanceof EntityLiving) { if (entity instanceof EntityLiving) {
// Players // Players
if (entity instanceof EntityHuman) { if (entity instanceof EntityHuman) {
if (entity instanceof EntityPlayer) { return new CraftPlayer( server, (EntityPlayer) entity); } if (entity instanceof EntityPlayer) { return new CraftPlayer(server, (EntityPlayer) entity); }
else { return new CraftHumanEntity( server, (EntityHuman) entity); } else { return new CraftHumanEntity(server, (EntityHuman) entity); }
} }
else if (entity instanceof EntityCreature) { else if (entity instanceof EntityCreature) {
// Animals // Animals
if (entity instanceof EntityAnimal) { if (entity instanceof EntityAnimal) {
if (entity instanceof EntityChicken) { return new CraftChicken( server, (EntityChicken) entity); } if (entity instanceof EntityChicken) { return new CraftChicken(server, (EntityChicken) entity); }
else if (entity instanceof EntityCow) { return new CraftCow( server, (EntityCow) entity); } else if (entity instanceof EntityCow) { return new CraftCow(server, (EntityCow) entity); }
else if (entity instanceof EntityPig) { return new CraftPig( server, (EntityPig) entity); } else if (entity instanceof EntityPig) { return new CraftPig(server, (EntityPig) entity); }
else if (entity instanceof EntityWolf) { return new CraftWolf( server, (EntityWolf) entity); } else if (entity instanceof EntityWolf) { return new CraftWolf(server, (EntityWolf) entity); }
else if (entity instanceof EntitySheep) { return new CraftSheep( server, (EntitySheep) entity); } else if (entity instanceof EntitySheep) { return new CraftSheep(server, (EntitySheep) entity); }
else { return new CraftAnimals( server, (EntityAnimal) entity); } else { return new CraftAnimals(server, (EntityAnimal) entity); }
} }
// Monsters // Monsters
else if (entity instanceof EntityMonster) { else if (entity instanceof EntityMonster) {
if (entity instanceof EntityZombie) { if (entity instanceof EntityZombie) {
if (entity instanceof EntityPigZombie) { return new CraftPigZombie( server, (EntityPigZombie) entity); } if (entity instanceof EntityPigZombie) { return new CraftPigZombie(server, (EntityPigZombie) entity); }
else { return new CraftZombie( server, (EntityZombie) entity); } else { return new CraftZombie(server, (EntityZombie) entity); }
} }
else if (entity instanceof EntityCreeper) { return new CraftCreeper( server, (EntityCreeper) entity); } else if (entity instanceof EntityCreeper) { return new CraftCreeper(server, (EntityCreeper) entity); }
else if (entity instanceof EntityGiantZombie) { return new CraftGiant( server, (EntityGiantZombie) entity); } else if (entity instanceof EntityGiantZombie) { return new CraftGiant(server, (EntityGiantZombie) entity); }
else if (entity instanceof EntitySkeleton) { return new CraftSkeleton( server, (EntitySkeleton) entity); } else if (entity instanceof EntitySkeleton) { return new CraftSkeleton(server, (EntitySkeleton) entity); }
else if (entity instanceof EntitySpider) { return new CraftSpider( server, (EntitySpider) entity); } else if (entity instanceof EntitySpider) { return new CraftSpider(server, (EntitySpider) entity); }
else { return new CraftMonster( server, (EntityMonster) entity); } else { return new CraftMonster(server, (EntityMonster) entity); }
} }
// Water Animals // Water Animals
else if (entity instanceof EntityWaterAnimal) { else if (entity instanceof EntityWaterAnimal) {
if (entity instanceof EntitySquid) { return new CraftSquid( server, (EntitySquid) entity); } if (entity instanceof EntitySquid) { return new CraftSquid(server, (EntitySquid) entity); }
else { return new CraftWaterMob( server, (EntityWaterAnimal) entity); } else { return new CraftWaterMob(server, (EntityWaterAnimal) entity); }
} }
else { return new CraftCreature( server, (EntityCreature) entity); } else { return new CraftCreature(server, (EntityCreature) entity); }
} }
// Slimes are a special (and broken) case // Slimes are a special (and broken) case
else if (entity instanceof EntitySlime) { return new CraftSlime( server, (EntitySlime) entity); } else if (entity instanceof EntitySlime) { return new CraftSlime(server, (EntitySlime) entity); }
// Flying // Flying
else if (entity instanceof EntityFlying) { else if (entity instanceof EntityFlying) {
if (entity instanceof EntityGhast) { return new CraftGhast( server, (EntityGhast) entity); } if (entity instanceof EntityGhast) { return new CraftGhast(server, (EntityGhast) entity); }
else { return new CraftFlying( server, (EntityFlying) entity); } else { return new CraftFlying(server, (EntityFlying) entity); }
} }
else { return new CraftLivingEntity(server, (EntityLiving) entity); } else { return new CraftLivingEntity(server, (EntityLiving) entity); }
} }
else if (entity instanceof EntityArrow) { return new CraftArrow( server, (EntityArrow) entity); } else if (entity instanceof EntityArrow) { return new CraftArrow(server, (EntityArrow) entity); }
else if (entity instanceof EntityBoat) { return new CraftBoat( server, (EntityBoat) entity); } else if (entity instanceof EntityBoat) { return new CraftBoat(server, (EntityBoat) entity); }
else if (entity instanceof EntityEgg) { return new CraftEgg( server, (EntityEgg) entity); } else if (entity instanceof EntityEgg) { return new CraftEgg(server, (EntityEgg) entity); }
else if (entity instanceof EntityFallingSand) { return new CraftFallingSand( server, (EntityFallingSand) entity); } else if (entity instanceof EntityFallingSand) { return new CraftFallingSand(server, (EntityFallingSand) entity); }
else if (entity instanceof EntityFireball) { return new CraftFireball( server, (EntityFireball) entity); } else if (entity instanceof EntityFireball) { return new CraftFireball(server, (EntityFireball) entity); }
else if (entity instanceof EntityFish) { return new CraftFish( server, (EntityFish) entity); } else if (entity instanceof EntityFish) { return new CraftFish(server, (EntityFish) entity); }
else if (entity instanceof EntityItem) { return new CraftItem( server, (EntityItem) entity); } else if (entity instanceof EntityItem) { return new CraftItem(server, (EntityItem) entity); }
else if (entity instanceof EntityWeather) { else if (entity instanceof EntityWeather) {
if (entity instanceof EntityWeatherStorm) { if (entity instanceof EntityWeatherStorm) {
return new CraftLightningStrike(server, (EntityWeatherStorm)entity); return new CraftLightningStrike(server, (EntityWeatherStorm)entity);
@ -93,10 +93,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return new CraftMinecart(server, mc); return new CraftMinecart(server, mc);
} }
} }
else if (entity instanceof EntityPainting) { return new CraftPainting( server, (EntityPainting) entity); } else if (entity instanceof EntityPainting) { return new CraftPainting(server, (EntityPainting) entity); }
else if (entity instanceof EntitySnowball) { return new CraftSnowball( server, (EntitySnowball) entity); } else if (entity instanceof EntitySnowball) { return new CraftSnowball(server, (EntitySnowball) entity); }
else if (entity instanceof EntityTNTPrimed) { return new CraftTNTPrimed( server, (EntityTNTPrimed) entity); } else if (entity instanceof EntityTNTPrimed) { return new CraftTNTPrimed(server, (EntityTNTPrimed) entity); }
else throw new IllegalArgumentException( "Unknown entity" ); else throw new IllegalArgumentException("Unknown entity");
} }
public Location getLocation() { public Location getLocation() {

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

@ -13,7 +13,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
public CraftHumanEntity(final CraftServer server, final EntityHuman entity) { public CraftHumanEntity(final CraftServer server, final EntityHuman entity) {
super(server, entity); super(server, entity);
this.inventory = new CraftInventoryPlayer( entity.inventory ); this.inventory = new CraftInventoryPlayer(entity.inventory);
} }
public String getName() { public String getName() {
@ -28,7 +28,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
public void setHandle(final EntityHuman entity) { public void setHandle(final EntityHuman entity) {
super.setHandle((EntityHuman)entity); super.setHandle((EntityHuman)entity);
this.entity = entity; this.entity = entity;
this.inventory = new CraftInventoryPlayer( entity.inventory ); this.inventory = new CraftInventoryPlayer(entity.inventory);
} }
public PlayerInventory getInventory() { public PlayerInventory getInventory() {

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

@ -197,8 +197,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
manager.server.tracker.untrackEntity(entity); manager.server.tracker.untrackEntity(entity);
int cx = (int) location.getBlockX() >> 4; int cx = (int) location.getBlockX() >> 4;
int cz = (int) location.getBlockZ() >> 4; int cz = (int) location.getBlockZ() >> 4;
for (int x = -10 ; x <= 10 ; x++ ) { for (int x = -10 ; x <= 10 ; x++) {
for (int z = -10 ; z <= 10 ; z++ ) { for (int z = -10 ; z <= 10 ; z++) {
ChunkCoordIntPair chunkPosition = new ChunkCoordIntPair(cx + x, cz + z); ChunkCoordIntPair chunkPosition = new ChunkCoordIntPair(cx + x, cz + z);
if (entity.g.remove(chunkPosition)) { if (entity.g.remove(chunkPosition)) {
newEntity.g.add(chunkPosition); newEntity.g.add(chunkPosition);

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

@ -17,7 +17,7 @@ public class CraftStorageMinecart extends CraftMinecart implements StorageMineca
public CraftStorageMinecart(CraftServer server, EntityMinecart entity) { public CraftStorageMinecart(CraftServer server, EntityMinecart entity) {
super(server, entity); super(server, entity);
inventory = new CraftInventory( entity ); inventory = new CraftInventory(entity);
} }
public Inventory getInventory() { public Inventory getInventory() {

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

@ -30,7 +30,7 @@ public class CraftWolf extends CraftAnimals implements Wolf {
public void setSitting(boolean sitting) { public void setSitting(boolean sitting) {
getHandle().setSitting(sitting); getHandle().setSitting(sitting);
// TODO determine what the following would do - it is affected every time a player makes their wolf sit or stand // TODO determine what the following would do - it is affected every time a player makes their wolf sit or stand
//getHandle().ay = false; // getHandle().ay = false;
setPath((PathEntity) null); setPath((PathEntity) null);
} }

30
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -34,7 +34,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
ItemStack[] items = new ItemStack[getSize()]; ItemStack[] items = new ItemStack[getSize()];
net.minecraft.server.ItemStack[] mcItems = getInventory().getContents(); net.minecraft.server.ItemStack[] mcItems = getInventory().getContents();
for (int i = 0; i < mcItems.length; i++ ) { for (int i = 0; i < mcItems.length; i++) {
items[i] = mcItems[i] == null ? null : new CraftItemStack(mcItems[i]); items[i] = mcItems[i] == null ? null : new CraftItemStack(mcItems[i]);
} }
@ -48,18 +48,18 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
net.minecraft.server.ItemStack[] mcItems = getInventory().getContents(); net.minecraft.server.ItemStack[] mcItems = getInventory().getContents();
for (int i = 0; i < items.length; i++ ) { for (int i = 0; i < items.length; i++) {
ItemStack item = items[i]; ItemStack item = items[i];
if (item == null || item.getTypeId() <= 0) { if (item == null || item.getTypeId() <= 0) {
mcItems[i] = null; mcItems[i] = null;
} else { } else {
mcItems[i] = new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDurability()); mcItems[i] = new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability());
} }
} }
} }
public void setItem(int index, ItemStack item) { public void setItem(int index, ItemStack item) {
getInventory().setItem(index, (item == null ? null : new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDurability()))); getInventory().setItem(index, (item == null ? null : new net.minecraft.server.ItemStack(item.getTypeId(), item.getAmount(), item.getDurability())));
} }
public boolean contains(int materialId) { public boolean contains(int materialId) {
@ -121,7 +121,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
for (int i = 0; i < inventory.length; i++) { for (int i = 0; i < inventory.length; i++) {
ItemStack item = inventory[i]; ItemStack item = inventory[i];
if (item != null && item.getTypeId() == materialId) { if (item != null && item.getTypeId() == materialId) {
slots.put( i, item ); slots.put(i, item);
} }
} }
return slots; return slots;
@ -137,7 +137,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
ItemStack[] inventory = getContents(); ItemStack[] inventory = getContents();
for (int i = 0; i < inventory.length; i++) { for (int i = 0; i < inventory.length; i++) {
if (item.equals(inventory[i])) { if (item.equals(inventory[i])) {
slots.put( i, inventory[i] ); slots.put(i, inventory[i]);
} }
} }
} }
@ -238,11 +238,11 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
} else { } else {
// More than a single stack! // More than a single stack!
if (item.getAmount() > getMaxItemStack()) { if (item.getAmount() > getMaxItemStack()) {
setItem( firstFree, new CraftItemStack(item.getTypeId(), getMaxItemStack(), item.getDurability())); setItem(firstFree, new CraftItemStack(item.getTypeId(), getMaxItemStack(), item.getDurability()));
item.setAmount(item.getAmount() - getMaxItemStack()); item.setAmount(item.getAmount() - getMaxItemStack());
} else { } else {
// Just store it // Just store it
setItem( firstFree, item ); setItem(firstFree, item);
break; break;
} }
} }
@ -256,13 +256,13 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
// Check if it fully fits // Check if it fully fits
if (amount + partialAmount <= maxAmount) { if (amount + partialAmount <= maxAmount) {
partialItem.setAmount( amount + partialAmount ); partialItem.setAmount(amount + partialAmount);
break; break;
} }
// It fits partially // It fits partially
partialItem.setAmount( maxAmount ); partialItem.setAmount(maxAmount);
item.setAmount( amount + partialAmount - maxAmount ); item.setAmount(amount + partialAmount - maxAmount);
} }
} }
} }
@ -283,7 +283,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
// Drat! we don't have this type in the inventory // Drat! we don't have this type in the inventory
if (first == -1) { if (first == -1) {
item.setAmount( toDelete ); item.setAmount(toDelete);
leftover.put(i, item); leftover.put(i, item);
break; break;
} else { } else {
@ -293,11 +293,11 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
if (amount <= toDelete) { if (amount <= toDelete) {
toDelete -= amount; toDelete -= amount;
// clear the slot, all used up // clear the slot, all used up
clear( first ); clear(first);
} else { } else {
// split the stack and store // split the stack and store
itemStack.setAmount( amount - toDelete ); itemStack.setAmount(amount - toDelete);
setItem( first, itemStack ); setItem(first, itemStack);
toDelete = 0; toDelete = 0;
} }
} }

22
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
View File

@ -19,11 +19,11 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
} }
public ItemStack getItemInHand() { public ItemStack getItemInHand() {
return new CraftItemStack( getInventory().getItemInHand() ); return new CraftItemStack(getInventory().getItemInHand());
} }
public void setItemInHand(ItemStack stack) { public void setItemInHand(ItemStack stack) {
setItem( getHeldItemSlot(), stack ); setItem(getHeldItemSlot(), stack);
} }
public int getHeldItemSlot() { public int getHeldItemSlot() {
@ -31,42 +31,42 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
} }
public ItemStack getHelmet() { public ItemStack getHelmet() {
return getItem( getSize() + 3 ); return getItem(getSize() + 3);
} }
public ItemStack getChestplate() { public ItemStack getChestplate() {
return getItem( getSize() + 2 ); return getItem(getSize() + 2);
} }
public ItemStack getLeggings() { public ItemStack getLeggings() {
return getItem( getSize() + 1 ); return getItem(getSize() + 1);
} }
public ItemStack getBoots() { public ItemStack getBoots() {
return getItem( getSize() + 0 ); return getItem(getSize() + 0);
} }
public void setHelmet(ItemStack helmet) { public void setHelmet(ItemStack helmet) {
setItem( getSize() + 3, helmet ); setItem(getSize() + 3, helmet);
} }
public void setChestplate(ItemStack chestplate) { public void setChestplate(ItemStack chestplate) {
setItem( getSize() + 2, chestplate ); setItem(getSize() + 2, chestplate);
} }
public void setLeggings(ItemStack leggings) { public void setLeggings(ItemStack leggings) {
setItem( getSize() + 1, leggings ); setItem(getSize() + 1, leggings);
} }
public void setBoots(ItemStack boots) { public void setBoots(ItemStack boots) {
setItem( getSize() + 0, boots ); setItem(getSize() + 0, boots);
} }
public CraftItemStack[] getArmorContents() { public CraftItemStack[] getArmorContents() {
net.minecraft.server.ItemStack[] mcItems = getInventory().getArmorContents(); net.minecraft.server.ItemStack[] mcItems = getInventory().getArmorContents();
CraftItemStack[] ret = new CraftItemStack[mcItems.length]; CraftItemStack[] ret = new CraftItemStack[mcItems.length];
for (int i = 0; i < mcItems.length; i++ ) { for (int i = 0; i < mcItems.length; i++) {
ret[i] = new CraftItemStack(mcItems[i]); ret[i] = new CraftItemStack(mcItems[i]);
} }
return ret; return ret;

4
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftSlot.java
View File

@ -12,7 +12,7 @@ public class CraftSlot implements org.bukkit.inventory.Slot {
} }
public Inventory getInventory() { public Inventory getInventory() {
return new CraftInventory( slot.inventory ); return new CraftInventory(slot.inventory);
} }
public int getIndex() { public int getIndex() {
@ -20,6 +20,6 @@ public class CraftSlot implements org.bukkit.inventory.Slot {
} }
public ItemStack getItem() { public ItemStack getItem() {
return new CraftItemStack( slot.getItem() ); return new CraftItemStack(slot.getItem());
} }
} }

2
paper-server/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
View File

@ -59,7 +59,7 @@ public class CraftScheduler implements BukkitScheduler, Runnable {
firstTick = first.getExecutionTick(); firstTick = first.getExecutionTick();
if (currentTick >= firstTick ) { if (currentTick >= firstTick) {
schedulerQueue.remove(first); schedulerQueue.remove(first);
processTask(first); processTask(first);
if (first.getPeriod()>=0) { if (first.getPeriod()>=0) {

2
paper-server/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
View File

@ -91,7 +91,7 @@ public class CraftTask implements Comparable<Object>, BukkitTask {
} }
@Override @Override
public boolean equals( Object other ) { public boolean equals(Object other) {
if (other == null) { if (other == null) {
return false; return false;

2
paper-server/src/main/java/org/bukkit/craftbukkit/scheduler/CraftWorker.java
View File

@ -74,7 +74,7 @@ public class CraftWorker implements Runnable, BukkitWorker {
} }
@Override @Override
public boolean equals( Object other ) { public boolean equals(Object other) {
if (other == null) { if (other == null) {
return false; return false;
} }

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/Java15Compat.java
View File

@ -21,7 +21,7 @@ public class Java15Compat {
if (original.length >= start && 0 <= start) { if (original.length >= start && 0 <= start) {
if (start <= end) { if (start <= end) {
int length = end - start; int length = end - start;
int copyLength = Math.min( length, original.length - start); int copyLength = Math.min(length, original.length - start);
long[] copy = (long[]) Array.newInstance(original.getClass().getComponentType(), length); long[] copy = (long[]) Array.newInstance(original.getClass().getComponentType(), length);
System.arraycopy(original, start, copy, 0, copyLength); System.arraycopy(original, start, copy, 0, copyLength);
return copy; return copy;