Fix some bug

MohistMC · Jun 26, 2024 · 64dd831 · 64dd831
1 parent d2611e9
commit 64dd831
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/patches/minecraft/net/minecraft/nbt/CompoundTag.java.patch b/patches/minecraft/net/minecraft/nbt/CompoundTag.java.patch
@@ -8,14 +8,6 @@
  Tag tag = CompoundTag.m_128413_(TagTypes.m_129397_(b0), s, p_128485_, p_128486_ + 1, p_128487_);
  if (map.put(s, tag) != null) {
  p_128487_.m_6800_(288L);
-@@ -153,6 +_,7 @@
-
- @Nullable
- public Tag m_128365_(String p_128366_, Tag p_128367_) {
-+ if (p_128367_ == null) throw new IllegalArgumentException("Invalid null NBT value with key " + p_128366_);
- return this.f_128329_.put(p_128366_, p_128367_);
- }
-
 @@ -445,11 +_,12 @@
  }
 

diff --git a/patches/minecraft/net/minecraft/world/entity/decoration/ArmorStand.java.patch b/patches/minecraft/net/minecraft/world/entity/decoration/ArmorStand.java.patch
@@ -9,6 +9,20 @@
  };
  private final NonNullList<ItemStack> f_31538_ = NonNullList.m_122780_(2, ItemStack.f_41583_);
  private final NonNullList<ItemStack> f_31539_ = NonNullList.m_122780_(4, ItemStack.f_41583_);
+@@ -95,6 +_,13 @@
+ this.m_6034_(p_31557_, p_31558_, p_31559_);
+ }
+
++ // CraftBukkit start - SPIGOT-3607, SPIGOT-3637
++ @Override
++ public float getBukkitYaw() {
++ return this.m_146908_();
++ }
++ // CraftBukkit end
++
+ public void m_6210_() {
+ double d0 = this.m_20185_();
+ double d1 = this.m_20186_();
 @@ -153,6 +_,21 @@
 
  }