Repackage patches

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
--- a/paper-server/nms-patches/net/minecraft/world/item/ItemBoat.patch
+++ b/paper-server/nms-patches/net/minecraft/world/item/ItemBoat.patch
@@ -0,0 +1,33 @@
+--- a/net/minecraft/server/ItemBoat.java
+++ b/net/minecraft/server/ItemBoat.java
+@@ -41,6 +41,13 @@
+             }
+ 
+             if (movingobjectpositionblock.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
+                // CraftBukkit start - Boat placement
+                org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), itemstack, enumhand);
+
+                if (event.isCancelled()) {
+                    return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
+                }
+                // CraftBukkit end
+                 EntityBoat entityboat = new EntityBoat(world, movingobjectpositionblock.getPos().x, movingobjectpositionblock.getPos().y, movingobjectpositionblock.getPos().z);
+ 
+                 entityboat.setType(this.b);
+@@ -49,7 +56,15 @@
+                     return InteractionResultWrapper.fail(itemstack);
+                 } else {
+                     if (!world.isClientSide) {
+-                        world.addEntity(entityboat);
+                        // CraftBukkit start
+                        if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPlaceEvent(world, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), entityhuman, entityboat).isCancelled()) {
+                            return InteractionResultWrapper.fail(itemstack);
+                        }
+
+                        if (!world.addEntity(entityboat)) {
+                            return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
+                        }
+                        // CraftBukkit end
+                         if (!entityhuman.abilities.canInstantlyBuild) {
+                             itemstack.subtract(1);
+                         }