Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Minor cleanups

Browse Source
This commit is contained in:
Erik Broes 2011-03-23 16:39:25 +01:00
parent 49043a8aff
commit ca1c9ef2e1
10 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/Chunk.java
View File

@ -7,9 +7,10 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
// CraftBukkit
// CraftBukkit start
import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftWorld;
// CraftBukkit end
public class Chunk {

5
src/main/java/net/minecraft/server/ConsoleLogManager.java
View File

@ -6,10 +6,11 @@ import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.Handler; // CraftBukkit
import jline.ConsoleReader;
// CraftBukkit start
import java.util.logging.Handler;
import org.bukkit.craftbukkit.util.ShortConsoleLogFormatter;
import org.bukkit.craftbukkit.util.TerminalConsoleHandler;
// CraftBukkit end
public class ConsoleLogManager {

2
src/main/java/net/minecraft/server/EntityCow.java
View File

@ -2,10 +2,8 @@ package net.minecraft.server;
// CraftBukkit start
import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerBucketFillEvent;
// CraftBukkit end

2
src/main/java/net/minecraft/server/ItemBlock.java
View File

@ -1,8 +1,6 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.Material;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.block.CraftBlockState;
import org.bukkit.craftbukkit.event.CraftEventFactory;

7
src/main/java/net/minecraft/server/ItemBucket.java
View File

@ -2,17 +2,10 @@ package net.minecraft.server;
// CraftBukkit start
import org.bukkit.Location;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Type;
import org.bukkit.event.player.PlayerBucketEmptyEvent;
import org.bukkit.event.player.PlayerBucketFillEvent;
import org.bukkit.event.player.PlayerItemEvent;
// CraftBukkit end
public class ItemBucket extends Item {

2
src/main/java/net/minecraft/server/ItemInWorldManager.java
View File

@ -14,7 +14,7 @@ public class ItemInWorldManager {
private World b;
public EntityHuman a;
public float c = 0.0F; // CraftBukkit private -> public
private float c = 0.0F;
private int d;
private int e = 0;
private float f = 0.0F;

1
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@ -17,7 +17,6 @@ import java.io.PrintStream;
import java.net.UnknownHostException;
import jline.ConsoleReader;
import joptsimple.OptionSet;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.LoggerOutputStream;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;

6
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@ -16,7 +16,6 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.TextWrapper;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Type;
import org.bukkit.event.block.*;
@ -496,11 +495,13 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
public void a(String s, Object[] aobject) {
// CraftBukkit start -- rarely it would send a disconnect line twice
if (!this.c) {
a.info(this.e.name + " lost connection: " + s);
this.d.f.a((Packet) (new Packet3Chat("\u00A7e" + this.e.name + " left the game.")));
this.d.f.c(this.e);
}
// CraftBukkit end
this.c = true;
}
@ -841,7 +842,8 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
tileentitysign.h();
this.e.world.g(i, k, j); // CraftBukkit
// CraftBukkit
this.e.world.g(i, k, j);
}
}
}

1
src/main/java/net/minecraft/server/ServerConfigurationManager.java
View File

@ -14,7 +14,6 @@ import java.util.logging.Logger;
// CraftBukkit start
import org.bukkit.Location;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;

1
src/main/java/net/minecraft/server/WorldServer.java
View File

@ -5,7 +5,6 @@ import java.util.List;
import java.util.Random;
// CraftBukkit start
import java.io.File;
import org.bukkit.BlockChangeDelegate;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;