Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci-skip] import

Browse Source
This commit is contained in:
BillyGalbreath
2022-10-01 22:49:25 -05:00
parent a47ad460fd
commit 123cc4dc82
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0306-Fix-MC-252892.patch
View File

@@ -5,23 +5,15 @@ Subject: [PATCH] Fix MC-252892
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index bd77301ef6cde21e1ee1966d2ffa418685f4a214..644812ce5251cba4e41277758363dfa350f4292d 100644
index bd77301ef6cde21e1ee1966d2ffa418685f4a214..f946772601cf7ab74104611842fffed4ea9a3bb9 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -10,6 +10,7 @@ import net.minecraft.world.MenuProvider;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.DoubleHighBlockItem;
import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.GameType;
import net.minecraft.world.level.Level;
@@ -521,7 +522,7 @@ public class ServerPlayerGameMode {
@@ -521,7 +521,7 @@ public class ServerPlayerGameMode {
}
if (player.getCooldowns().isOnCooldown(stack.getItem())) {
- cancelledBlock = true;
+ cancelledBlock = stack.getItem() != Items.GOAT_HORN; // Purpur
+ cancelledBlock = stack.getItem() != net.minecraft.world.item.Items.GOAT_HORN; // Purpur
}
PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation()); // Paper