minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-30 16:19:11 +02:00
Code Issues Releases Wiki Activity

Cleaning up item spawning and kits.

Browse Source
This commit is contained in:
KHobbits
2012-01-04 17:51:14 +00:00
parent 6dd73f5247
commit de0a419476
10 changed files with 71 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Essentials/src/com/earth2me/essentials/user/User.java
View File

@@ -654,21 +654,21 @@ public class User extends UserBase implements IUser
}
@Override
public void giveItems(ItemStack itemStack)
public void giveItems(ItemStack itemStack, Boolean canSpew)
{
if (giveItemStack(itemStack))
if (giveItemStack(itemStack, canSpew))
{
sendMessage(_("InvFull"));
}
}
@Override
public void giveItems(List<ItemStack> itemStacks)
public void giveItems(List<ItemStack> itemStacks, Boolean canSpew)
{
boolean spew = false;
for (ItemStack itemStack : itemStacks)
{
if (giveItemStack(itemStack))
if (giveItemStack(itemStack, canSpew))
{
spew = true;
}
@@ -679,9 +679,15 @@ public class User extends UserBase implements IUser
}
}
private boolean giveItemStack(ItemStack itemStack)
private boolean giveItemStack(ItemStack itemStack, Boolean canSpew)
{
boolean spew = false;
if (itemStack == null || itemStack.getType() == Material.AIR)
{
return spew;
}
final Map<Integer, ItemStack> overfilled;
if (isAuthorized("essentials.oversizedstacks"))
{
@@ -696,11 +702,14 @@ public class User extends UserBase implements IUser
{
overfilled = InventoryWorkaround.addItem(getInventory(), true, itemStack);
}
for (ItemStack overflowStack : overfilled.values())
if (canSpew)
{
getWorld().dropItemNaturally(getLocation(), overflowStack);
spew = true;
for (ItemStack overflowStack : overfilled.values())
{
getWorld().dropItemNaturally(getLocation(), overflowStack);
spew = true;
}
}
return spew;
}
}
}