geforkt von Mirrors/Paper
61 Zeilen
3.3 KiB
Diff
61 Zeilen
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||
|
|
Date: Thu, 17 Sep 2020 00:36:05 +0100
|
||
|
|
Subject: [PATCH] Extend block drop capture to capture all items added to the
|
||
|
|
world
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index 22266fda4de9b5fbace3b8e55ce390b8d7e75a65..fe7b71fbb3963beafe93a5d86bebdd629c7ec8f2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -95,6 +95,7 @@ import net.minecraft.world.entity.ai.village.poi.PoiType;
|
||
|
|
import net.minecraft.world.entity.animal.horse.SkeletonHorse;
|
||
|
|
import net.minecraft.world.entity.boss.EnderDragonPart;
|
||
|
|
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
|
||
|
|
+import net.minecraft.world.entity.item.ItemEntity;
|
||
|
|
import net.minecraft.world.entity.monster.Drowned;
|
||
|
|
import net.minecraft.world.entity.player.Player;
|
||
|
|
import net.minecraft.world.entity.raid.Raid;
|
||
|
|
@@ -1284,6 +1285,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
} else if (this.isUUIDUsed(entity)) {
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
+ // Paper start - capture all item additions to the world
|
||
|
|
+ if (captureDrops != null && entity instanceof ItemEntity) {
|
||
|
|
+ captureDrops.add((ItemEntity) entity);
|
||
|
|
+ return true;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
||
|
|
index 79f3e4176145c42debb9adc1e68175cf063c1f22..6269e37f2859417a80e6de16045f1c2325f9746f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
||
|
|
@@ -6,6 +6,7 @@ import net.minecraft.world.InteractionResult;
|
||
|
|
import net.minecraft.world.InteractionResultHolder;
|
||
|
|
import net.minecraft.world.MenuProvider;
|
||
|
|
import net.minecraft.world.entity.EquipmentSlot;
|
||
|
|
+import net.minecraft.world.entity.item.ItemEntity;
|
||
|
|
import net.minecraft.world.entity.player.Player;
|
||
|
|
import net.minecraft.world.item.DoubleHighBlockItem;
|
||
|
|
import net.minecraft.world.item.ItemStack;
|
||
|
|
@@ -418,10 +419,12 @@ public class ServerPlayerGameMode {
|
||
|
|
// return true; // CraftBukkit
|
||
|
|
}
|
||
|
|
// CraftBukkit start
|
||
|
|
+ java.util.List<ItemEntity> itemsToDrop = level.captureDrops; // Paper - store current list
|
||
|
|
+ level.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff
|
||
|
|
if (event.isDropItems()) {
|
||
|
|
- org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, level.captureDrops);
|
||
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref
|
||
|
|
}
|
||
|
|
- level.captureDrops = null;
|
||
|
|
+ //world.captureDrops = null; // Paper - move up
|
||
|
|
|
||
|
|
// Drop event experience
|
||
|
|
if (flag && event != null) {
|