Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-24 19:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Added: #10: Dispenser für niemandem mehr zugänglich

Browse Source 
https://github.com/DieReicheErethons/DungeonsXL/issues/issue/10
This commit is contained in:
Grafe 2013-01-12 04:32:30 +01:00
parent 8145fae487
commit 466b7305a7
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/dre/dungeonsxl/LanguageReader.java
View File

@ -22,8 +22,6 @@ public class LanguageReader {
/* Load */ /* Load */
this.file = file; this.file = file;
P.p.log("FilePath:"+file.getPath());
FileConfiguration configFile = YamlConfiguration.loadConfiguration(file); FileConfiguration configFile = YamlConfiguration.loadConfiguration(file);
Set<String> keySet = configFile.getKeys(false); Set<String> keySet = configFile.getKeys(false);
@ -68,6 +66,7 @@ public class LanguageReader {
/* Errors */ /* Errors */
defaults.put("Error_Enderchest","&4Du kannst keine Enderchest in einem Dungeon verwenden!"); defaults.put("Error_Enderchest","&4Du kannst keine Enderchest in einem Dungeon verwenden!");
defaults.put("Error_Dispenser","&4Du kannst nicht auf diesen Dispenser zugreifen!");
defaults.put("Error_Ready","&4Wähle zuerst eine Klasse aus!"); defaults.put("Error_Ready","&4Wähle zuerst eine Klasse aus!");
defaults.put("Error_Cooldown","&4Du kannst den Dungeon nur alle &6&v1&4 Stunden betreten!"); defaults.put("Error_Cooldown","&4Du kannst den Dungeon nur alle &6&v1&4 Stunden betreten!");
defaults.put("Error_Leftklick","&4Du musst das Schild mit Links-klick berühren!"); defaults.put("Error_Leftklick","&4Du musst das Schild mit Links-klick berühren!");

17
src/com/dre/dungeonsxl/listener/PlayerListener.java
View File

@ -43,11 +43,13 @@ public class PlayerListener implements Listener{
Player player = event.getPlayer(); Player player = event.getPlayer();
Block clickedBlock=event.getClickedBlock(); Block clickedBlock=event.getClickedBlock();
//Block Enderchests
if(clickedBlock!=null){ if(clickedBlock!=null){
//Block Enderchests
if(GameWorld.get(player.getWorld())!=null || EditWorld.get(player.getWorld())!=null){ if(GameWorld.get(player.getWorld())!=null || EditWorld.get(player.getWorld())!=null){
if(event.getAction()!=Action.LEFT_CLICK_BLOCK){ if(event.getAction()!=Action.LEFT_CLICK_BLOCK){
if(clickedBlock.getType()==Material.ENDER_CHEST){ if(clickedBlock.getType()==Material.ENDER_CHEST){
if(!player.isOp()){
p.msg(player, p.language.get("Error_Enderchest")); p.msg(player, p.language.get("Error_Enderchest"));
event.setCancelled(true); event.setCancelled(true);
} }
@ -55,6 +57,19 @@ public class PlayerListener implements Listener{
} }
} }
//Block Dispensers
if(GameWorld.get(player.getWorld())!=null){
if(event.getAction()!=Action.LEFT_CLICK_BLOCK){
if(clickedBlock.getType()==Material.DISPENSER){
if(!player.isOp()){
p.msg(player, p.language.get("Error_Dispenser"));
event.setCancelled(true);
}
}
}
}
}
//Check Portals //Check Portals
if(event.getItem()!=null){ if(event.getItem()!=null){