Skip to content

Commit 585ad82

Browse files
MrButtersDEVMrButtersDEV
authored
Merge pull request #44 from SaberSupe/master
Optimization changes
2 parents f4ec959 + debefa0 commit 585ad82

File tree

4 files changed

+103
-92
lines changed

4 files changed

+103
-92
lines changed

‎src/main/java/us/thezircon/play/autopickup/listeners/BlockBreakEventListener.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,14 @@ public class BlockBreakEventListener implements Listener {
3838

3939
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
4040
public void onBreak(BlockBreakEvent e) {
41-
Block block = e.getBlock();
41+
4242
Player player = e.getPlayer();
43+
44+
if (!PLUGIN.autopickup_list.contains(player)) {
45+
return;
46+
}
47+
48+
Block block = e.getBlock();
4349
Location loc = e.getBlock().getLocation();
4450
boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
4551
boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklisted");
@@ -56,10 +62,6 @@ public void onBreak(BlockBreakEvent e) {
5662
}
5763
}
5864

59-
if (!PLUGIN.autopickup_list.contains(player)) {
60-
return;
61-
}
62-
6365
// QuickShop chest patch
6466
if (AutoPickup.usingQuickShop) {
6567
if(e.toString().startsWith("org.maxgamer.quickshop.util.PermissionChecker")) {

‎src/main/java/us/thezircon/play/autopickup/listeners/BlockDropItemEventListener.java‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ public class BlockDropItemEventListener implements Listener {
2323

2424
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
2525
public void onDrop(BlockDropItemEvent e) {
26+
2627
Player player = e.getPlayer();
28+
29+
if (!PLUGIN.autopickup_list.contains(player)) return; // Player has auto enabled
30+
2731
Block block = e.getBlock();
2832
boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
2933
boolean doBlacklist = PLUGIN.getBlacklistConf().getBoolean("doBlacklisted");
@@ -45,53 +49,53 @@ public void onDrop(BlockDropItemEvent e) {
4549
// return; // Containers are handled in block break event
4650
// }
4751

48-
if (PLUGIN.autopickup_list.contains(player)) { // Player has auto enabled
49-
for (Item i : e.getItems()) {
52+
53+
for (Item i : e.getItems()) {
5054

5155
// if (i==null || i.isDead() || !i.isValid()) {
5256
// System.out.println("RAR " + i.getItemStack().getType() + " " + (i==null) + " "+ (i.isDead()) + " " + (!i.isValid()));
5357
// continue; // TEST
5458
// }
5559

56-
ItemStack drop = i.getItemStack();
60+
ItemStack drop = i.getItemStack();
5761

58-
if (player.getInventory().firstEmpty() == -1) { // Checks for inventory space
59-
//Player has no space
60-
if (doFullInvMSG) {player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());}
62+
if (player.getInventory().firstEmpty() == -1) { // Checks for inventory space
63+
//Player has no space
64+
if (doFullInvMSG) {player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());}
6165

62-
if (voidOnFullInv) {
63-
i.remove();
64-
}
65-
66-
return;
66+
if (voidOnFullInv) {
67+
i.remove();
6768
}
6869

69-
if (doBlacklist) { // Checks if blacklist is enabled
70-
if (blacklist.contains(drop.getType().toString())) { // Stops resets the loop skipping the item & not removing it
71-
continue;
72-
}
73-
}
70+
return;
71+
}
7472

75-
if (doSmelt) {
76-
drop = AutoSmelt.smelt(drop, player);
73+
if (doBlacklist) { // Checks if blacklist is enabled
74+
if (blacklist.contains(drop.getType().toString())) { // Stops resets the loop skipping the item & not removing it
75+
continue;
7776
}
77+
}
7878

79-
HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drop);
80-
if (leftOver.keySet().size()>0) {
81-
for (ItemStack item : leftOver.values()) {
82-
player.getWorld().dropItemNaturally(loc, item);
83-
}
84-
}
79+
if (doSmelt) {
80+
drop = AutoSmelt.smelt(drop, player);
81+
}
8582

86-
// if (doSmelt) {
87-
// player.getInventory().addItem(AutoSmelt.smelt(drop, player));
88-
// } else {
89-
// player.getInventory().addItem(drop);
90-
// }
91-
i.remove();
83+
HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drop);
84+
if (leftOver.keySet().size()>0) {
85+
for (ItemStack item : leftOver.values()) {
86+
player.getWorld().dropItemNaturally(loc, item);
87+
}
9288
}
9389

90+
// if (doSmelt) {
91+
// player.getInventory().addItem(AutoSmelt.smelt(drop, player));
92+
// } else {
93+
// player.getInventory().addItem(drop);
94+
// }
95+
i.remove();
9496
}
9597

98+
99+
96100
}
97101
}

‎src/main/java/us/thezircon/play/autopickup/listeners/EntityDeathEventListener.java‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public void onDeath(EntityDeathEvent e) {
2929
}
3030

3131
Player player = e.getEntity().getKiller();
32+
33+
if (!PLUGIN.autopickup_list_mobs.contains(player)) return;
34+
3235
boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
3336

3437
Location loc = e.getEntity().getKiller().getLocation();
@@ -45,52 +48,52 @@ public void onDeath(EntityDeathEvent e) {
4548
}
4649
}
4750

48-
if (PLUGIN.autopickup_list_mobs.contains(player)) {
49-
50-
// Mend Items & Give Player XP
51-
int xp = e.getDroppedExp();
52-
player.giveExp(xp); // Give player XP
53-
54-
// Mend
55-
mend(player.getInventory().getItemInMainHand(), xp);
56-
mend(player.getInventory().getItemInOffHand(), xp);
57-
ItemStack armor[] = player.getInventory().getArmorContents();
58-
for (ItemStack i : armor)
59-
{
60-
try {
61-
mend(i, xp);
62-
} catch (NullPointerException ignored) {}
63-
}
64-
e.setDroppedExp(0); // Remove default XP
65-
66-
// Drops
67-
Iterator<ItemStack> iter = e.getDrops().iterator();
68-
while (iter.hasNext()) {
69-
ItemStack drops = iter.next();
70-
71-
HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drops);
72-
iter.remove();
73-
if (leftOver.keySet().size()>0) {
74-
for (ItemStack item : leftOver.values()) {
75-
player.getWorld().dropItemNaturally(loc, item);
76-
}
77-
if (doFullInvMSG) {
78-
player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
79-
}
51+
52+
53+
// Mend Items & Give Player XP
54+
int xp = e.getDroppedExp();
55+
player.giveExp(xp); // Give player XP
56+
57+
// Mend
58+
mend(player.getInventory().getItemInMainHand(), xp);
59+
mend(player.getInventory().getItemInOffHand(), xp);
60+
ItemStack armor[] = player.getInventory().getArmorContents();
61+
for (ItemStack i : armor)
62+
{
63+
try {
64+
mend(i, xp);
65+
} catch (NullPointerException ignored) {}
66+
}
67+
e.setDroppedExp(0); // Remove default XP
68+
69+
// Drops
70+
Iterator<ItemStack> iter = e.getDrops().iterator();
71+
while (iter.hasNext()) {
72+
ItemStack drops = iter.next();
73+
74+
HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drops);
75+
iter.remove();
76+
if (leftOver.keySet().size()>0) {
77+
for (ItemStack item : leftOver.values()) {
78+
player.getWorld().dropItemNaturally(loc, item);
79+
}
80+
if (doFullInvMSG) {
81+
player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
8082
}
83+
}
8184

8285

83-
// if (player.getInventory().firstEmpty() != -1) { // has space
84-
// player.getInventory().addItem(drops);
85-
// iter.remove();
86-
// } else { // inv full
87-
// if (doFullInvMSG) {
88-
// player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
89-
// }
90-
// return;
86+
// if (player.getInventory().firstEmpty() != -1) { // has space
87+
// player.getInventory().addItem(drops);
88+
// iter.remove();
89+
// } else { // inv full
90+
// if (doFullInvMSG) {
91+
// player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
9192
// }
92-
}
93-
e.getDrops().clear();
93+
// return;
94+
// }
9495
}
96+
e.getDrops().clear();
97+
9598
}
9699
}

‎src/main/java/us/thezircon/play/autopickup/listeners/MythicMobListener.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public void onDeath(MythicMobDeathEvent e) {
3434
return;
3535
}
3636

37+
if (!PLUGIN.autopickup_list_mobs.contains(player)) return;
38+
3739
boolean doFullInvMSG = PLUGIN.getConfig().getBoolean("doFullInvMSG");
3840

3941
Location loc = e.getKiller().getLocation();
@@ -50,24 +52,24 @@ public void onDeath(MythicMobDeathEvent e) {
5052
}
5153
}
5254

53-
if (PLUGIN.autopickup_list_mobs.contains(player)) {
54-
// Drops
55-
Iterator<ItemStack> iter = e.getDrops().iterator();
56-
while (iter.hasNext()) {
57-
ItemStack drops = iter.next();
58-
HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drops);
59-
iter.remove();
60-
if (leftOver.keySet().size()>0) {
61-
for (ItemStack item : leftOver.values()) {
62-
player.getWorld().dropItemNaturally(loc, item);
63-
}
64-
if (doFullInvMSG) {
65-
player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
66-
}
55+
56+
// Drops
57+
Iterator<ItemStack> iter = e.getDrops().iterator();
58+
while (iter.hasNext()) {
59+
ItemStack drops = iter.next();
60+
HashMap<Integer, ItemStack> leftOver = player.getInventory().addItem(drops);
61+
iter.remove();
62+
if (leftOver.keySet().size()>0) {
63+
for (ItemStack item : leftOver.values()) {
64+
player.getWorld().dropItemNaturally(loc, item);
65+
}
66+
if (doFullInvMSG) {
67+
player.sendMessage(PLUGIN.getMsg().getPrefix() + " " + PLUGIN.getMsg().getFullInventory());
6768
}
6869
}
69-
e.getDrops().clear();
7070
}
71+
e.getDrops().clear();
72+
7173
}
7274

7375
}

0 commit comments

Comments
 (0)