mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
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:
3a54fb16 SPIGOT-7296: Add ItemFlag#HIDE_ARMOR_TRIM

CraftBukkit Changes:
55056ad80 SPIGOT-7295: Fix Sniffer data defined in incorrect position
This commit is contained in:
Jake Potrebic 2023-03-15 12:59:34 -07:00
parent 9b0e97b75b
commit a2918a5fea
No known key found for this signature in database
GPG key ID: 27CC63F7CBC866C7
7 changed files with 32 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

42
patches/server/0962-Fix-sniffer.patch
View file

@ -1,42 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 14 Mar 2023 20:03:21 -0700
Subject: [PATCH] Fix sniffer
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index efcfce93d17507bb6cc870a94eaa777429050d18..5719172a31f005ce419f365011d53712a9b2820f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -74,12 +74,20 @@ public class Sniffer extends Animal {
public Sniffer(EntityType<? extends Animal> type, Level world) {
super(type, world);
- this.entityData.define(DATA_STATE, Sniffer.State.IDLING);
- this.entityData.define(DATA_DROP_SEED_AT_TICK, 0);
+ // Paper - move to defineSyncedData
this.getNavigation().setCanFloat(true);
this.setPathfindingMalus(BlockPathTypes.WATER, -2.0F);
}
+ // Paper start
+ @Override
+ protected void defineSynchedData() {
+ super.defineSynchedData();
+ this.entityData.define(DATA_STATE, Sniffer.State.IDLING);
+ this.entityData.define(DATA_DROP_SEED_AT_TICK, 0);
+ }
+ // Paper end
+
@Override
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
return this.getDimensions(pose).height * 0.6F;
@@ -388,7 +396,7 @@ public class Sniffer extends Animal {
@Override
public Brain<Sniffer> getBrain() {
- return super.getBrain();
+ return (Brain<Sniffer>) super.getBrain(); // Paper - decompile issue
}
@Override