Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears 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:
b999860d SPIGOT-2304: Add LootGenerateEvent

CraftBukkit Changes:
77fd87e4 SPIGOT-2304: Implement LootGenerateEvent
a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent
41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
This commit is contained in:
Aikar
2020-05-01 18:03:47 -04:00
parent a6a197b11f
commit 57dd397155
699 changed files with 1945 additions and 1938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch
View File

@@ -1,4 +1,4 @@
From ab0e36766506a33e33b15878e29a96554d9869ba Mon Sep 17 00:00:00 2001
From ffad3e160f4a75b8038d80aab72ffaa3d6a846f5 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Thu, 26 Jul 2018 02:25:46 -0400
Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
- Enable/Disable slot interactions
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 992d7bfb..61d7d507 100644
index 992d7bfb0f..61d7d507aa 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 992d7bfb..61d7d507 100644
return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 124c3185..d1d689e5 100644
index 124c3185bc..d1d689e5d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -126,5 +126,5 @@ index 124c3185..d1d689e5 100644
// Paper end
}
--
2.25.1.windows.1
2.26.2