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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
BillyGalbreath
2022-08-09 08:39:25 -05:00
parent d7b3ae90ce
commit b1925ac31f
18 changed files with 56 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0008-Ridables.patch
View File

@@ -2194,13 +2194,13 @@ index 45c3cec839a7c23903dedf6e3e004305da2adceb..248531727dcafb71d7d2d2767205e09a
this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index b5172f14606981a1e787d662a1cbed9d710071aa..a4b390af92e5923ca54e37c0feb263bafe2e19de 100644
index 2d87b740e84435ef9bd3eee3d3e2af9f707a0826..d9cd71c57cde4cbd7131344ba7760fb6c224c7b6 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -95,10 +95,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
private float dancingAnimationTicks;
@@ -101,10 +101,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
private float spinningAnimationTicks;
private float spinningAnimationTicks0;
public boolean forceDancing = false; // CraftBukkit
+ private org.purpurmc.purpur.controller.FlyingMoveControllerWASD purpurController; // Purpur
public Allay(EntityType<? extends Allay> type, Level world) {
@@ -2220,11 +2220,11 @@ index b5172f14606981a1e787d662a1cbed9d710071aa..a4b390af92e5923ca54e37c0feb263ba
+ };
+ // Purpur end
this.setCanPickUpLoot(this.canPickUpLoot());
PositionSource positionSource = new EntityPositionSource(this, this.getEyeHeight());
this.vibrationListenerConfig = new Allay.AllayVibrationListenerConfig();
@@ -106,6 +119,28 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
this.dynamicJukeboxListener = new DynamicGameEventListener<>(new Allay.JukeboxListener(positionSource, GameEvent.JUKEBOX_PLAY.getNotificationRadius()));
EntityPositionSource entitypositionsource = new EntityPositionSource(this, this.getEyeHeight());
@@ -119,6 +132,28 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
}
// CraftBukkit end
+ // Purpur start
+ @Override
@@ -2250,7 +2250,7 @@ index b5172f14606981a1e787d662a1cbed9d710071aa..a4b390af92e5923ca54e37c0feb263ba
+
@Override
protected Brain.Provider<Allay> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index fdd2c63ff0017bafa544a3cff2ee6d2d62c92cb3..32b31e5efb5fc68430b9bcd4cd972494f53accc8 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java