geforkt von Mirrors/Paper
90fe0d58a5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
43 Zeilen
2.1 KiB
Diff
43 Zeilen
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Seggan <segganew@gmail.com>
|
|
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 52f3f679568955b632a60d44de687c6db0e2b38a..3ec2f590dfe9410f1a9d2afb530eebfcce917798 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
|
|
@@ -392,4 +392,15 @@ public class Goat extends Animal {
|
|
protected Vector3f getPassengerAttachmentPoint(Entity passenger, EntityDimensions dimensions, float scaleFactor) {
|
|
return new Vector3f(0.0F, dimensions.height - 0.1875F * scaleFactor, 0.0F);
|
|
}
|
|
+
|
|
+ // 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
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
|
|
index 65fcb36e849da6949c123a6f3672b485036f368e..2c21de478bff9cdf13ba46cd041831d54c11e924 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java
|
|
@@ -48,4 +48,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
|
|
}
|