3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-19 04:50:06 +01:00

SPIGOT-5373: Simultaneous left+right click in creative mode does not work

Dieser Commit ist enthalten in:
md_5 2019-10-19 20:09:26 +11:00
Ursprung 13caf84858
Commit 606c19e26c

Datei anzeigen

@ -242,7 +242,7 @@
} }
} }
} }
@@ -272,12 +410,41 @@ @@ -272,12 +410,40 @@
} }
} }
@ -253,7 +253,6 @@
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition(); BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
IBlockData iblockdata = world.getType(blockposition); IBlockData iblockdata = world.getType(blockposition);
+ EnumInteractionResult enuminteractionresult = EnumInteractionResult.PASS; + EnumInteractionResult enuminteractionresult = EnumInteractionResult.PASS;
+ if (iblockdata.isAir()) return enuminteractionresult;
+ boolean cancelledBlock = false; + boolean cancelledBlock = false;
if (this.gamemode == EnumGamemode.SPECTATOR) { if (this.gamemode == EnumGamemode.SPECTATOR) {
@ -284,7 +283,7 @@
if (itileinventory != null) { if (itileinventory != null) {
entityhuman.openContainer(itileinventory); entityhuman.openContainer(itileinventory);
@@ -289,24 +456,26 @@ @@ -289,24 +455,26 @@
boolean flag = !entityhuman.getItemInMainHand().isEmpty() || !entityhuman.getItemInOffHand().isEmpty(); boolean flag = !entityhuman.getItemInMainHand().isEmpty() || !entityhuman.getItemInOffHand().isEmpty();
boolean flag1 = entityhuman.isSneaking() && flag; boolean flag1 = entityhuman.isSneaking() && flag;