Skip to content

Commit 8ba7d2a

Browse files
committed
Merge pull request #1 from net/ender-chest-fix
Reset a player's ender chest when appropriate
2 parents 361a421 + f82bffc commit 8ba7d2a

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<groupId>org.mctourney.autoreferee</groupId>
1111
<artifactId>AutoReferee</artifactId>
12-
<version>2.7.1-UNOFFICIAL</version>
12+
<version>2.7.2-UNOFFICIAL</version>
1313
<name>AutoReferee Core Plugin</name>
1414
<url>http://www.reddit.com/r/mctourney</url>
1515
<description>Bukkit plugin for automatically refereeing competitive Minecraft matches.</description>

src/main/java/org/mctourney/autoreferee/util/PlayerUtil.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.bukkit.GameMode;
66
import org.bukkit.entity.Player;
7+
import org.bukkit.inventory.Inventory;
78
import org.bukkit.inventory.PlayerInventory;
89
import org.bukkit.potion.PotionEffect;
910
import org.bukkit.potion.PotionEffectType;
@@ -78,6 +79,16 @@ public static void removeStatusEffects(Player player)
7879
for (PotionEffect effect : player.getActivePotionEffects())
7980
player.removePotionEffect(effect.getType());
8081
}
82+
83+
/**
84+
* Clears player's ender chest
85+
*/
86+
public static void clearEnderChest(Player player)
87+
{
88+
// clear the ender chest
89+
Inventory enderChest = player.getEnderChest();
90+
enderChest.clear();
91+
}
8192

8293
/**
8394
* Performs all PlayerUtil actions on this player.
@@ -95,6 +106,9 @@ public static void reset(Player player)
95106

96107
// remove potion and beacon effects
97108
removeStatusEffects(player);
109+
110+
// clear their ender chest
111+
clearEnderChest(player);
98112
}
99113

100114
private static class BufferedGameModeChangeTask extends BukkitRunnable

src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: AutoReferee
22
main: org.mctourney.autoreferee.AutoReferee
3-
version: 2.7.1 FOR 1.8
3+
version: 2.7.2 FOR 1.8
44
author: "authorblues, net"
55
load: startup
66

0 commit comments

Comments
 (0)