zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed inventory rollbacks not modifying player equipment slots (#170)

Browse source
This commit is contained in:
Intelli 2022-03-11 17:20:52 -07:00
parent dedba3c57f
commit 3011aece46
2 changed files with 56 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/net/coreprotect/database/Rollback.java
View file

@ -62,6 +62,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.EntityEquipment;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.BannerMeta; import org.bukkit.inventory.meta.BannerMeta;
import org.bukkit.inventory.meta.BlockStateMeta; import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.CrossbowMeta; import org.bukkit.inventory.meta.CrossbowMeta;
@ -1615,13 +1616,32 @@ public class Rollback extends Queue {
else { else {
Inventory inventory = (Inventory) container; Inventory inventory = (Inventory) container;
if (inventory != null) { if (inventory != null) {
boolean isPlayerInventory = (inventory instanceof PlayerInventory);
if (action == 1) { if (action == 1) {
int count = 0; int count = 0;
int amount = itemstack.getAmount(); int amount = itemstack.getAmount();
itemstack.setAmount(1); itemstack.setAmount(1);
while (count < amount) { while (count < amount) {
inventory.addItem(itemstack); boolean addedItem = false;
if (isPlayerInventory) {
addedItem = Util.setPlayerArmor((PlayerInventory) inventory, itemstack);
}
if (!addedItem) {
addedItem = (inventory.addItem(itemstack).size() == 0);
}
if (!addedItem && isPlayerInventory) {
PlayerInventory playerInventory = (PlayerInventory) inventory;
ItemStack offhand = playerInventory.getItemInOffHand();
if (offhand == null || offhand.getType() == Material.AIR || (itemstack.isSimilar(offhand) && offhand.getAmount() < offhand.getMaxStackSize())) {
ItemStack setOffhand = itemstack.clone();
if (itemstack.isSimilar(offhand)) {
setOffhand.setAmount(offhand.getAmount() + 1);
}
playerInventory.setItemInOffHand(setOffhand);
}
}
count++; count++;
} }
} }
@ -1630,7 +1650,7 @@ public class Rollback extends Queue {
ItemStack removeMatch = itemstack.clone(); ItemStack removeMatch = itemstack.clone();
removeMatch.setAmount(1); removeMatch.setAmount(1);
ItemStack[] inventoryContents = inventory.getStorageContents().clone(); ItemStack[] inventoryContents = (isPlayerInventory ? inventory.getContents() : inventory.getStorageContents()).clone();
for (int i = inventoryContents.length - 1; i >= 0; i--) { for (int i = inventoryContents.length - 1; i >= 0; i--) {
if (inventoryContents[i] != null) { if (inventoryContents[i] != null) {
ItemStack itemStack = inventoryContents[i].clone(); ItemStack itemStack = inventoryContents[i].clone();
@ -1667,7 +1687,12 @@ public class Rollback extends Queue {
} }
} }
inventory.setStorageContents(inventoryContents); if (isPlayerInventory) {
inventory.setContents(inventoryContents);
}
else {
inventory.setStorageContents(inventoryContents);
}
int count = 0; int count = 0;
while (count < removeAmount) { while (count < removeAmount) {

28
src/main/java/net/coreprotect/utility/Util.java
View file

@ -44,6 +44,7 @@ import org.bukkit.inventory.BlockInventoryHolder;
import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.EntityEquipment;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.util.io.BukkitObjectOutputStream; import org.bukkit.util.io.BukkitObjectOutputStream;
@ -655,6 +656,33 @@ public class Util extends Queue {
return artname; return artname;
} }
public static boolean setPlayerArmor(PlayerInventory inventory, ItemStack itemStack) {
String itemName = itemStack.getType().name();
boolean isHelmet = (itemName.endsWith("_HELMET") || itemName.endsWith("_HEAD") || itemName.endsWith("_SKULL") || itemName.endsWith("_PUMPKIN"));
boolean isChestplate = (itemName.endsWith("_CHESTPLATE"));
boolean isLeggings = (itemName.endsWith("_LEGGINGS"));
boolean isBoots = (itemName.endsWith("_BOOTS"));
if (isHelmet && inventory.getHelmet() == null) {
inventory.setHelmet(itemStack);
return true;
}
else if (isChestplate && inventory.getChestplate() == null) {
inventory.setChestplate(itemStack);
return true;
}
else if (isLeggings && inventory.getLeggings() == null) {
inventory.setLeggings(itemStack);
return true;
}
else if (isBoots && inventory.getBoots() == null) {
inventory.setBoots(itemStack);
return true;
}
return false;
}
public static ItemStack[] getArmorStandContents(EntityEquipment equipment) { public static ItemStack[] getArmorStandContents(EntityEquipment equipment) {
ItemStack[] contents = new ItemStack[6]; ItemStack[] contents = new ItemStack[6];
if (equipment != null) { if (equipment != null) {