Merge remote-tracking branch 'origin/api-10' into api-11

Author: aromaa

src/main/java/org/spongepowered/common/inventory/custom/SpongeInventoryMenu.java

@@ -232,8 +232,9 @@ public boolean onClick(
             if (slot.isPresent()) {
                 switch (clickTypeIn) {
                     case SWAP:
-                        if (dragType >= 0 && dragType < 9) {
-                            final Optional<org.spongepowered.api.item.inventory.Slot> slot2 = container.slot(dragType);
+                        if (dragType >= 0 && dragType < 9 || dragType == 40) {
+                            final Optional<org.spongepowered.api.item.inventory.Slot> slot2 =
+                                    ((org.spongepowered.api.entity.living.player.Player) player).inventory().slot(dragType);
                             if (slot2.isPresent() && this.keySwapHandler != null) {
                                 return this.keySwapHandler.handle(cause, container, slot.get(), slotId, ClickTypes.KEY_SWAP.get(), slot2.get());
                             }

src/mixins/java/org/spongepowered/common/mixin/core/world/entity/LivingEntityMixin.java

@@ -107,6 +107,8 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt
     @Shadow protected boolean dead;
     @Shadow protected int deathScore;
     @Shadow protected ItemStack useItem;
+    @Shadow @Nullable private DamageSource lastDamageSource;
+    @Shadow private long lastDamageStamp;
 
     @Shadow public abstract AttributeInstance shadow$getAttribute(Attribute attribute);
     @Shadow public abstract void shadow$setHealth(float health);
@@ -726,4 +728,12 @@ protected void actuallyHurt(final DamageSource damageSource, final float damage)
         ((Living) this).setRotation(event.toRotation());
     }
 
+    @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/damagesource/CombatTracker;recheckStatus()V", shift = At.Shift.AFTER))
+    private void impl$clearLastDamageSource(final CallbackInfo ci) {
+        //Fix for MC-270896 - Players leak the last entity they took damage from
+        if (this.lastDamageSource != null && this.shadow$level().getGameTime() - this.lastDamageStamp > 40L) {
+            this.lastDamageSource = null;
+        }
+    }
+
 }

src/mixins/java/org/spongepowered/common/mixin/inventory/impl/server/level/ServerPlayer_Mixin_Inventory.java

@@ -0,0 +1,59 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.inventory.impl.server.level;
+
+import net.minecraft.core.NonNullList;
+import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.common.inventory.adapter.impl.slots.SlotAdapter;
+import org.spongepowered.common.item.util.ItemStackUtil;
+
+@Mixin(targets = "net/minecraft/server/level/ServerPlayer$1")
+public abstract class ServerPlayer_Mixin_Inventory {
+
+    // @formatter:off
+    @Shadow @Final ServerPlayer this$0;
+    // @formatter:on
+
+    @Inject(method = "sendInitialData", at = @At("RETURN"))
+    private void inventory$sendOffhand(final AbstractContainerMenu containerMenu, final NonNullList<ItemStack> $$1, final ItemStack $$2, final int[] $$3, final CallbackInfo ci) {
+        if (containerMenu == this.this$0.inventoryMenu) {
+            return;
+        }
+
+        final org.spongepowered.api.item.inventory.Slot offhand
+                = ((org.spongepowered.api.entity.living.player.server.ServerPlayer) this.this$0).inventory().offhand();
+        this.this$0.connection.send(
+                new ClientboundContainerSetSlotPacket(-2, 0, ((SlotAdapter) offhand).getOrdinal(), ItemStackUtil.toNative(offhand.peek())));
+    }
+}

src/mixins/resources/mixins.sponge.inventory.json

@@ -63,6 +63,7 @@
         "impl.common.entity.player.SpongeUserInventoryMixin_Lens_Bridge",
         "impl.common.inventory.custom.CarriedWrapperInventoryMixin_Adapter_Inventory",
         "impl.common.inventory.custom.CustomInventoryMixin_Lens_Inventory",
+        "impl.server.level.ServerPlayer_Mixin_Inventory",
         "impl.world.ContainerMixin_Fabric_Inventory",
         "impl.world.TraitMixin_TrackedMenuBridge_Inventory",
         "impl.world.entity.LivingEntityMixin_EquipmentFabric_Inventory",