twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s

Browse Source
This commit is contained in:
Erik Broes
2011-01-11 09:25:13 +01:00
parent 75654e8db5
commit 22dab8e985
44 changed files with 770 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,13 @@
package net.minecraft.server;
import java.util.Random;
// CraftBukkit start
import org.bukkit.BlockFace;
import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.event.Event.Type;
import org.bukkit.event.block.BlockFromToEvent;
// CraftBukkit end
public class BlockFlowing extends BlockFluids {
@@ -86,8 +87,8 @@ public class BlockFlowing extends BlockFluids {
} else {
i(world, i1, j1, k1);
}
// Craftbukkit start
// 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
@@ -101,6 +102,7 @@ public class BlockFlowing extends BlockFluids {
world.b(i1, j1 - 1, k1, bh, l1 + 8);
}
}
// CraftBukkit end
} else if (l1 >= 0 && (l1 == 0 || k(world, i1, j1 - 1, k1))) {
boolean aflag[] = j(world, i1, j1, k1);
int k2 = l1 + byte0;
@@ -111,10 +113,10 @@ public class BlockFlowing extends BlockFluids {
if (k2 >= 8) {
return;
}
// Craftbukkit all four cardinal directions. Do not change the order!
// CraftBukkit start - all four cardinal directions. Do not change the order!
BlockFace[] faces = new BlockFace[]{ BlockFace.North, BlockFace.South, BlockFace.East, BlockFace.West };
int index = 0;
for (BlockFace currentFace : faces) {
for (BlockFace currentFace: faces) {
if (aflag[index]) {
BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace);
((WorldServer) world).getServer().getPluginManager().callEvent(event);
@@ -124,8 +126,8 @@ public class BlockFlowing extends BlockFluids {
}
index++;
}
// CraftBukkit end
}
// Craftbukkit stop
}
private void f(World world, int i1, int j1, int k1, int l1) {
@@ -278,4 +280,3 @@ public class BlockFlowing extends BlockFluids {
}
}
}