SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Fixed building in water

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Dinnerbone 2011-01-04 16:17:05 +00:00
Ursprung 1ed14de10e
Commit ca765c3512
1 geänderte Dateien mit 1 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/main/java/net/minecraft/server/WorldServer.java
Datei anzeigen

@ -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.