Merge pull request #42 from KaiijuMC/update-upstream

Update Upstream (Folia)
2023-04-11 02:17:39 +03:00 · 2023-04-10 23:07:20 +00:00 · 2023-04-09 18:03:48 +03:00
2 changed files with 3 additions and 3 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = dev.kaiijumc.kaiiju
 version = 1.19.4-R0.1-SNAPSHOT
 mcVersion = 1.19.4

-foliaRef = 105f6d6a21599d7f6951318e0d230495ac109ec9
+foliaRef = ad70ddfc204ab3aecab5b7cb280ebeb7f93f6347

 org.gradle.caching=true
 org.gradle.parallel=true
--- a/patches/server/0009-Kaiiju-Gameplay-ShulkerDropContentsWhenDestroyed.patch
+++ b/patches/server/0009-Kaiiju-Gameplay-ShulkerDropContentsWhenDestroyed.patch
@@ -20,7 +20,7 @@ index 73d79fe0077b28db2f9e7fa13a1ae6eff9abd6a9..bac11b0e30a86d0689693ff129b53bca
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index b0204af850ee182773ad458208cccd946ad148d5..a4dff10cf787b187ffc716b2278c2dc6999ecb00 100644
+index b0204af850ee182773ad458208cccd946ad148d5..cb67928eb9d493b4c43489aa06a5c0c947999dac 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -288,7 +288,7 @@ public class BlockItem extends Item {
@@ -28,7 +28,7 @@ index b0204af850ee182773ad458208cccd946ad148d5..a4dff10cf787b187ffc716b2278c2dc6
     @Override
     public void onDestroyed(ItemEntity entity) {
 -        if (this.block instanceof ShulkerBoxBlock) {
-+        if (this.block instanceof ShulkerBoxBlock && entity.getLevel().kaiijuConfig.shulkerBoxDropContentsWhenDestroyed) {
+        if (this.block instanceof ShulkerBoxBlock && entity.getLevel().kaiijuConfig.shulkerBoxDropContentsWhenDestroyed) { // Kaiiju
             ItemStack itemstack = entity.getItem();
             CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack);
Author	SHA1	Message	Date
Sofiane H. Djerbi	5562bd750f	Merge pull request #42 from KaiijuMC/update-upstream Update Upstream (Folia)	2023-04-11 02:17:39 +03:00
kugge	cedc442598	Update Upstream (Folia)	2023-04-10 23:07:20 +00:00
Sofiane H. Djerbi	35983edbd3	[skip ci] Quickfix uncommented line	2023-04-09 18:03:48 +03:00