OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 20:50:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed building in water

Browse source
This commit is contained in:
Dinnerbone 2011-01-04 16:17:05 +00:00
parent 1ed14de10e
commit ca765c3512
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/minecraft/server/WorldServer.java
View file

@ -101,17 +101,13 @@ public class WorldServer extends World {
if (axisalignedbb != null && !a(axisalignedbb)) { if (axisalignedbb != null && !a(axisalignedbb)) {
return false; return false;
} }
// Craftbukkit - check this first as we dont want to allow the user to override this either
// Notch checks it after the check to see if block is water, lava, fire, portal
if (!(i1 > 0 && block == null)) return false;
boolean defaultReturn; boolean defaultReturn;
if (block == Block.A || block == Block.B || block == Block.C || block == Block.D || block == Block.ar || block == Block.aS) { if (block == Block.A || block == Block.B || block == Block.C || block == Block.D || block == Block.ar || block == Block.aS) {
defaultReturn = true; defaultReturn = true;
} else { } else {
defaultReturn = block1.a(this, j1, k1, l1); defaultReturn = (i1 > 0) && (block == null) && (block1.a(this, j1, k1, l1));
} }
// Craftbukkit - If flag is true, it's natural, not user placement. Don't hook. // Craftbukkit - If flag is true, it's natural, not user placement. Don't hook.