Skip to content

fix: item-drop rollback discards item instead of returning it to player #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
netcrafts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: item-drop rollback discards item instead of returning it to player #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/main/kotlin/com/github/quiltservertools/ledger/actions/ItemDropActionType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import net.minecraft.world.entity.EntityTypes
import net.minecraft.world.entity.item.ItemEntity
import net.minecraft.world.item.ItemStackTemplate
import net.minecraft.world.level.storage.TagValueInput
import net.minecraft.world.phys.Vec3

// TODO remove duplication from ItemPickUpActionType and ItemDropActionType
open class ItemDropActionType : AbstractActionType() {
Expand Down Expand Up @@ -47,18 +48,25 @@ open class ItemDropActionType : AbstractActionType() {
}

override fun rollback(server: MinecraftServer): Boolean {
val world = server.getWorld(world)
val world = server.getWorld(world) ?: return false

val newEntity = TagParser.parseCompoundFully(objectState!!)
val optionalUUID = newEntity.read(UUID, UUIDUtil.CODEC)
if (optionalUUID.isEmpty) return false
val entity = world?.getEntity(optionalUUID.get())

if (entity != null) {
entity.remove(Entity.RemovalReason.DISCARDED)
return true
}
return false
world.getEntity(optionalUUID.get())?.remove(Entity.RemovalReason.DISCARDED)
val stack = getStack(server)

// Return item to source player if online
val player = sourceProfile?.id?.let { server.playerList.getPlayer(it) }
if (player != null && player.inventory.add(stack)) return true

// Player offline or inventory full — drop at logged position
val drop = ItemEntity(EntityTypes.ITEM, world)
drop.setPos(Vec3.atCenterOf(pos))
drop.item = stack
world.addFreshEntity(drop)
return true
}

override fun restore(server: MinecraftServer): Boolean {
Expand Down
Loading