EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 11:44:42 +02:00
Code Issues Projects Releases Wiki Activity

Avoid picking up items to the hotbar while using unarmed. Fixes #939

Browse Source
This commit is contained in:
GJ
2013-04-09 16:28:02 -04:00
parent 532c2e7450
commit 7fe8122499
4 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gmail/nossr50/party/ShareHandler.java
View File

@ -91,9 +91,8 @@ public final class ShareHandler {
* @param mcMMOPlayer Player who picked up the item
* @return True if the item has been shared
*/
public static boolean handleItemShare(PlayerPickupItemEvent event, McMMOPlayer mcMMOPlayer) {
Item item = event.getItem();
ItemStack itemStack = item.getItemStack();
public static boolean handleItemShare(Item drop, McMMOPlayer mcMMOPlayer) {
ItemStack itemStack = drop.getItemStack();
Party party = mcMMOPlayer.getParty();
Player player = mcMMOPlayer.getPlayer();
Player winningPlayer = null;
@ -126,8 +125,7 @@ public final class ShareHandler {
nearMembers.add(player);
partySize = nearMembers.size();
event.setCancelled(true);
item.remove();
drop.remove();
int itemWeight = ItemWeightConfig.getInstance().getItemWeight(itemStack.getType());
for (int i = 0; i < itemStack.getAmount(); i++) {
@ -172,8 +170,7 @@ public final class ShareHandler {
partySize = nearMembers.size() + 1;
event.setCancelled(true);
item.remove();
drop.remove();
for (int i = 0; i < itemStack.getAmount(); i++) {
int randomMember = Misc.getRandom().nextInt(partySize);