Compare commits
No commits in common. "5628dfb459697f105b0b3821e123dbced21a50d0" and "dbbb60280b3128f4ccb99c00703f54db1255334c" have entirely different histories.
5628dfb459
...
dbbb60280b
1
pom.xml
1
pom.xml
@ -37,7 +37,6 @@
|
||||
<directory>${project.basedir}/src/main/resources</directory>
|
||||
<includes>
|
||||
<include>plugin.yml</include>
|
||||
<include>config.yml</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
|
@ -41,7 +41,6 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
|
||||
this.getLogger().info(prefix + ChatColor.WHITE + "Plugin Startet");
|
||||
this.getLogger().info(prefix + ChatColor.WHITE + "Initializing Gamemanager");
|
||||
gameManager = new GameManager(this);
|
||||
this.saveDefaultConfig();
|
||||
|
||||
// Registers Events
|
||||
this.getLogger().info(prefix + ChatColor.WHITE + "Lade Events");
|
||||
|
@ -17,14 +17,8 @@ public class back implements CommandExecutor {
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
|
||||
if (!this.gameManager.getConfigManager().GetBool("back_command")) {
|
||||
commandSender.sendMessage("back command ist nicht aktiv");
|
||||
return false;
|
||||
}
|
||||
|
||||
Player player = (Player) commandSender.getServer().getPlayer(commandSender.getName());
|
||||
Location lastDeath;
|
||||
|
||||
try {
|
||||
lastDeath = this.gameManager.getPlugin().getPlayerDataConfig().getLocation(player.getUniqueId() + ".death");
|
||||
player.teleport(lastDeath);
|
||||
@ -33,7 +27,6 @@ public class back implements CommandExecutor {
|
||||
} catch (Exception ex) {
|
||||
commandSender.sendMessage("Tot nicht gefunden!");
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -36,12 +36,9 @@ public class replanting {
|
||||
target.getLocation().getWorld().dropItem(loc, new ItemStack(item[0]));
|
||||
}
|
||||
|
||||
if (amount.length > 1) {
|
||||
for(int i = 0; i < amount[1]; i++) {
|
||||
target.getLocation().getWorld().dropItem(loc, new ItemStack(item[1]));
|
||||
}
|
||||
}
|
||||
|
||||
crop.setAge(0);
|
||||
target.setBlockData(crop);
|
||||
}
|
||||
|
@ -1,5 +1,6 @@
|
||||
package de.steev.bm.Listener;
|
||||
|
||||
import de.steev.bm.BetterMinecraft;
|
||||
import de.steev.bm.Manager.GameManager;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
@ -20,7 +21,7 @@ public class BedListener implements Listener {
|
||||
@EventHandler // Adding to the Player Variable
|
||||
public void onPlayerBedEnter(PlayerBedEnterEvent event) {
|
||||
final World world = event.getPlayer().getWorld();
|
||||
if(world.getTime() >= 13000 || world.getThunderDuration() > 0 && this.gameManager.getConfigManager().GetBool("improved_bed")) {
|
||||
if(world.getTime() >= 13000 || world.getThunderDuration() > 0) {
|
||||
this.gameManager.getPlugin().playerInBed++;
|
||||
// Checks if enough Players (currentSleeping >= OnlinePlayerAmount/2) are Sleeping
|
||||
if(this.gameManager.getPlugin().playerInBed >= (int)this.gameManager.getPlugin().getServer().getOnlinePlayers().size()/2) {
|
||||
@ -48,4 +49,5 @@ public class BedListener implements Listener {
|
||||
this.gameManager.getPlugin().playerInBed = 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ public class InteractListener implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event){
|
||||
if(event.getAction().equals(Action.RIGHT_CLICK_BLOCK) && this.gameManager.getConfigManager().GetBool("replanting")){
|
||||
if(event.getAction().equals(Action.RIGHT_CLICK_BLOCK)){
|
||||
|
||||
/** the clicked block */
|
||||
Block target = event.getClickedBlock();
|
||||
|
@ -29,12 +29,12 @@ public class KillListener implements Listener {
|
||||
int[] amounts;
|
||||
Material[] drops;
|
||||
|
||||
if(event.getEntity() instanceof Player && this.gameManager.getConfigManager().GetBool("back_command")){
|
||||
if(event.getEntity() instanceof Player){
|
||||
Location death = ((Player) event.getEntity()).getPlayer().getLocation();
|
||||
UUID uuid = ((Player) event.getEntity()).getPlayer().getUniqueId();
|
||||
this.gameManager.getPlugin().getPlayerDataConfig().set("" + uuid + ".death", death);
|
||||
} else if(event.getEntity() instanceof Animals) {
|
||||
if(event.getEntity().toString() == "CraftPig" && this.gameManager.getConfigManager().GetBool("custom_drops")){
|
||||
if(event.getEntity().toString() == "CraftPig"){
|
||||
amounts = new int[]{ 2,2 };
|
||||
drops = new Material[]{Material.LEATHER, Material.PORKCHOP};
|
||||
Death.onAnimalDeath(amounts, drops, this.gameManager.getPlugin(), event);
|
||||
|
@ -1,14 +0,0 @@
|
||||
package de.steev.bm.Manager;
|
||||
|
||||
public class ConfigManager {
|
||||
|
||||
private GameManager gameManager;
|
||||
|
||||
public ConfigManager(GameManager gameManager) {
|
||||
this.gameManager = gameManager;
|
||||
}
|
||||
|
||||
public boolean GetBool(String Key){
|
||||
return gameManager.getPlugin().getConfig().getBoolean(Key);
|
||||
}
|
||||
}
|
@ -12,7 +12,6 @@ public class GameManager {
|
||||
private BetterMinecraft plugin;
|
||||
private RecipyManager recipyManager;
|
||||
private PlayerManager playerManager;
|
||||
private ConfigManager configManager;
|
||||
|
||||
/**
|
||||
* initilizes the Gamemanager and all systems beneath it
|
||||
@ -27,9 +26,7 @@ public class GameManager {
|
||||
|
||||
this.recipyManager = new RecipyManager(this);
|
||||
this.playerManager = new PlayerManager(this);
|
||||
this.configManager = new ConfigManager(this);
|
||||
|
||||
if (this.configManager.GetBool("custom_recipes")) {
|
||||
this.plugin.getLogger().info("registring Recipies");
|
||||
this.plugin.getLogger().info("saddle");
|
||||
char[] s_ing = { 'L', 'S', 'I', 'W' };
|
||||
@ -42,7 +39,7 @@ public class GameManager {
|
||||
String[] w_rec = { " W ", "WFW", " W " };
|
||||
Material[] w_mat = { Material.WHITE_WOOL, Material.FLINT };
|
||||
this.recipyManager.RegisterNew(w_ing, w_mat, w_rec, 4, Material.STRING, "String");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public BetterMinecraft getPlugin(){
|
||||
@ -56,9 +53,5 @@ public class GameManager {
|
||||
public PlayerManager getPlayerManager() {
|
||||
return playerManager;
|
||||
}
|
||||
|
||||
public ConfigManager getConfigManager() {
|
||||
return configManager;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,5 +0,0 @@
|
||||
improved_bed: true
|
||||
custom_drops: true
|
||||
custom_recipes: true
|
||||
replanting: true
|
||||
back_command: true
|
Loading…
x
Reference in New Issue
Block a user