Fix duplicated BlockPistonRetractEvent call (#7111)

1 files changed, 44 insertions, 0 deletions

diff --git a/patches/server/0730-Goat-ram-API.patch b/patches/server/0730-Goat-ram-API.patch
new file mode 100644
index 0000000000..641bebca80
--- /dev/null
+++ b/patches/server/0730-Goat-ram-API.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Seggan <[email protected]>
+Date: Thu, 5 Aug 2021 13:10:27 -0400
+Subject: [PATCH] Goat ram API
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+index d3c4f93ee2aa1902eeca197c72eb17199fc41fb2..cc5687f43f8ac99995667fdc53c5c0586f70f367 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
++++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+@@ -285,6 +285,17 @@ public class Goat extends Animal {
+         return world.getBlockState(pos.below()).is((Tag) BlockTags.GOATS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos);
+     }
+ 
++    // Paper start - Goat ram API
++    public void ram(net.minecraft.world.entity.LivingEntity entity) {
++        Brain<Goat> brain = this.getBrain();
++        brain.setMemory(MemoryModuleType.RAM_TARGET, entity.position());
++        brain.eraseMemory(MemoryModuleType.RAM_COOLDOWN_TICKS);
++        brain.eraseMemory(MemoryModuleType.BREED_TARGET);
++        brain.eraseMemory(MemoryModuleType.TEMPTING_PLAYER);
++        brain.setActiveActivityIfPossible(net.minecraft.world.entity.schedule.Activity.RAM);
++    }
++    // Paper end
++
+     private static class GoatPathNavigation extends GroundPathNavigation {
+ 
+         GoatPathNavigation(Goat goat, Level world) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
+index ae74df5c9845ac125968a52897f4343b0f348217..436aa41563b8fab112d03c8cc516cf6ff37587bd 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
+@@ -34,4 +34,11 @@ public class CraftGoat extends CraftAnimals implements Goat {
+     public void setScreaming(boolean screaming) {
+         this.getHandle().setScreamingGoat(screaming);
+     }
++
++    // Paper start - Goat ram API
++    @Override
++    public void ram(@org.jetbrains.annotations.NotNull org.bukkit.entity.LivingEntity entity) {
++        this.getHandle().ram(((CraftLivingEntity) entity).getHandle());
++    }
++    // Paper end
+ }