Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Changed tabs to 4 spaces, removed unnecessary imports

Browse Source
This commit is contained in:
durron597 2011-01-01 08:06:04 -05:00
parent 84bf373c55
commit f199cc7190
10 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pom.xml Executable file → Normal file
View File

76
src/main/java/net/minecraft/server/BlockFlowing.java
View File

@ -56,8 +56,8 @@ public class BlockFlowing extends BlockFluids
if(world.d(i1, j1 - 1, k1))
j2 = 0;
else
if(world.c(i1, j1 - 1, k1) == bs && world.b(i1, j1, k1) == 0)
j2 = 0;
if(world.c(i1, j1 - 1, k1) == bs && world.b(i1, j1, k1) == 0)
j2 = 0;
if(bs == Material.g && l1 < 8 && j2 < 8 && j2 > l1 && random.nextInt(4) != 0)
{
j2 = l1;
@ -76,52 +76,52 @@ public class BlockFlowing extends BlockFluids
world.g(i1, j1, k1, bh);
}
} else
if(flag)
i(world, i1, j1, k1);
if(flag)
i(world, i1, j1, k1);
} else
{
i(world, i1, j1, k1);
}
// Craftbukkit start
CraftBlock source = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i1, j1, k1);
if(l(world, i1, j1 - 1, k1))
{
// Craftbucket send "down" to the server
BlockFromToEvent blockFlow = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.Down);
// Craftbucket send "down" to the server
BlockFromToEvent blockFlow = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.Down);
((WorldServer) world).getServer().getPluginManager().callEvent(blockFlow);
if (!blockFlow.isCancelled()) {
if(l1 >= 8)
world.b(i1, j1 - 1, k1, bh, l1);
else
world.b(i1, j1 - 1, k1, bh, l1 + 8);
}
} else
if(l1 >= 0 && (l1 == 0 || k(world, i1, j1 - 1, k1)))
{
boolean aflag[] = j(world, i1, j1, k1);
int k2 = l1 + byte0;
if(l1 >= 8)
k2 = 1;
if(k2 >= 8)
return;
// Craftbukkit start
BlockFace[] faces = new BlockFace[]{ BlockFace.North, BlockFace.South, BlockFace.East, BlockFace.West };
for (BlockFace currentFace : faces) {
int index = 0;
if (aflag[index]) {
BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace);
((WorldServer) world).getServer().getPluginManager().callEvent(event);
if (!event.isCancelled())
f(world, i1 + currentFace.getModX(), j1, k1 + currentFace.getModZ(), k2);
}
index++;
if (!blockFlow.isCancelled()) {
if(l1 >= 8)
world.b(i1, j1 - 1, k1, bh, l1);
else
world.b(i1, j1 - 1, k1, bh, l1 + 8);
}
} else
if(l1 >= 0 && (l1 == 0 || k(world, i1, j1 - 1, k1)))
{
boolean aflag[] = j(world, i1, j1, k1);
int k2 = l1 + byte0;
if(l1 >= 8)
k2 = 1;
if(k2 >= 8)
return;
// Craftbukkit start
BlockFace[] faces = new BlockFace[]{ BlockFace.North, BlockFace.South, BlockFace.East, BlockFace.West };
for (BlockFace currentFace : faces) {
int index = 0;
if (aflag[index]) {
BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace);
((WorldServer) world).getServer().getPluginManager().callEvent(event);
if (!event.isCancelled())
f(world, i1 + currentFace.getModX(), j1, k1 + currentFace.getModZ(), k2);
}
index++;
}
// Craftbukkit stop
}
// Craftbukkit stop
}
}
private void f(World world, int i1, int j1, int k1, int l1)

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

@ -19,7 +19,7 @@ import org.bukkit.craftbukkit.CraftServer;
public class MinecraftServer
implements ICommandListener, Runnable {
implements ICommandListener, Runnable {
public static Logger a = Logger.getLogger("Minecraft");
public static HashMap b = new HashMap();
@ -79,7 +79,7 @@ public class MinecraftServer
a.info((new StringBuilder()).append("Starting Minecraft server on ").append(s.length() != 0 ? s : "*").append(":").append(i1).toString());
try {
c = new NetworkListenThread(this, inetaddress, i1);
// CraftBukkit: Be more generic; IOException -> Throwable
// CraftBukkit: Be more generic; IOException -> Throwable
} catch (Throwable ioexception) {
a.warning("**** FAILED TO BIND TO PORT!");
a.log(Level.WARNING, (new StringBuilder()).append("The exception was: ").append(ioexception.toString()).toString());

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

@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
public class NetServerHandler extends NetHandler
implements ICommandListener {
implements ICommandListener {
public static Logger a = Logger.getLogger("Minecraft");
public NetworkManager b;
@ -394,7 +394,7 @@ public class NetServerHandler extends NetHandler
server.getPluginManager().callEvent(event);
s = (new StringBuilder()).append("<").append(event.getPlayer().getName()).append("> ").append(event.getMessage()).toString();
// CraftBukkit stop
a.info(s);
d.f.a(new Packet3Chat(s));
}

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

@ -104,7 +104,7 @@ public class ServerConfigurationManager {
} else if (b.size() >= e) {
event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full!");
}
server.getPluginManager().callEvent(event);
if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
netloginhandler.a(event.getKickMessage());

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

@ -51,9 +51,9 @@ public class WorldServer extends World {
public CraftWorld getWorld() {
return world;
}
public CraftServer getServer() {
return server;
return server;
}
// CraftBukkit stop
@ -92,19 +92,19 @@ public class WorldServer extends World {
// CraftBukkit start
@Override
public boolean a(int i1, int j1, int k1, int l1, boolean flag) {
boolean superResult = super.a(i1, j1, k1, l1, flag);
if (!flag) {
BlockCanBuildEvent event = new BlockCanBuildEvent(Type.BLOCK_CANBUILD, getWorld().getBlockAt(j1, k1, l1), i1, superResult);
server.getPluginManager().callEvent(event);
return event.isBuildable();
} else {
return superResult;
}
boolean superResult = super.a(i1, j1, k1, l1, flag);
if (!flag) {
BlockCanBuildEvent event = new BlockCanBuildEvent(Type.BLOCK_CANBUILD, getWorld().getBlockAt(j1, k1, l1), i1, superResult);
server.getPluginManager().callEvent(event);
return event.isBuildable();
} else {
return superResult;
}
}
// CraftBukkit stop
public void f() {
super.f();
}

2
src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
View File

@ -7,7 +7,7 @@ import org.bukkit.LivingEntity;
public class CraftLivingEntity extends CraftEntity implements LivingEntity {
private EntityLiving entity;
public CraftLivingEntity(final CraftServer server, final EntityLiving entity) {
super(server, entity);
this.entity = entity;

3
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -1,15 +1,12 @@
package org.bukkit.craftbukkit;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerConfigurationManager;
import net.minecraft.server.WorldServer;
import org.bukkit.*;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.SimplePluginManager;

6
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -16,7 +16,7 @@ public class CraftWorld implements World {
public CraftWorld(WorldServer world) {
this.world = world;
}
public Block getBlockAt(int x, int y, int z) {
BlockCoordinate loc = new BlockCoordinate(x, y, z);
Block block = blockCache.get(loc);
@ -78,7 +78,7 @@ public class CraftWorld implements World {
private final class ChunkCoordinate {
public final int x;
public final int z;
public ChunkCoordinate(final int x, final int z) {
this.x = x;
this.z = z;
@ -115,7 +115,7 @@ public class CraftWorld implements World {
public final int x;
public final int y;
public final int z;
public BlockCoordinate(final int x, final int y, final int z) {
this.x = x;
this.y = y;

2
src/main/java/org/bukkit/craftbukkit/Main.java
View File

@ -6,7 +6,7 @@ import net.minecraft.server.MinecraftServer;
public class Main {
public static void main(String[] args) {
// Todo: Installation script
try {
MinecraftServer.main(args);
} catch (Throwable t) {