ChromaGaming/ChromaCore
1
0
Fork 0
Code Issues 23 Pull requests 1 Projects Releases 11 Packages Wiki Activity

A few important fixes

Browse source
This commit is contained in:
Norbi Peti 2017-01-28 23:53:08 +01:00
parent 159cef01ff
commit ef42d811b0
4 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/buttondevteam/core/CommandCaller.java
View file

@ -1,11 +1,9 @@
package buttondevteam.core; package buttondevteam.core;
import java.util.Arrays; import java.util.Arrays;
import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

17
src/main/java/buttondevteam/core/PlayerListener.java
View file

@ -6,24 +6,17 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.player.TBMCPlayerBase;
public class PlayerListener implements Listener { public class PlayerListener implements Listener {
/*@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void OnPlayerJoin(PlayerJoinEvent event) { public void OnPlayerJoin(PlayerJoinEvent event) {
TBMCPlayer player = TBMCPlayer.loadPlayer(event.getPlayer()); TBMCPlayerBase.joinPlayer(event.getPlayer());
if (player == null) {
TBMCCoreAPI.SendException("Error on player join!", new Exception("Player is null"));
event.getPlayer().sendMessage("§c[TBMC] Failed to load player data! The error has been sent to the devs.");
} else
TBMCPlayer.joinPlayer(player);
} }
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void OnPlayerLeave(PlayerQuitEvent event) { public void OnPlayerLeave(PlayerQuitEvent event) {
TBMCPlayer player = TBMCPlayer.getPlayer(event.getPlayer()); TBMCPlayerBase.quitPlayer(event.getPlayer());
TBMCPlayer.savePlayer(player); }
TBMCPlayer.quitPlayer(player);
}*/
} }

2
src/main/java/buttondevteam/lib/player/ChromaGamerBase.java
View file

@ -60,7 +60,7 @@ public abstract class ChromaGamerBase implements AutoCloseable {
try { try {
T obj = cl.newInstance(); T obj = cl.newInstance();
final File file = new File(TBMC_PLAYERS_DIR + getFolderForType(cl), fname + ".yml"); final File file = new File(TBMC_PLAYERS_DIR + getFolderForType(cl), fname + ".yml");
file.mkdirs(); file.getParentFile().mkdirs();
obj.plugindata = YamlConfiguration.loadConfiguration(file); obj.plugindata = YamlConfiguration.loadConfiguration(file);
return obj; return obj;
} catch (Exception e) { } catch (Exception e) {

8
src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java
View file

@ -38,13 +38,6 @@ public abstract class TBMCPlayerBase extends ChromaGamerBase {
return getUUID().toString(); return getUUID().toString();
} }
// protected ConfigurationSection plugindata;
/*
* public static void load() { super.load(); plugindata = super.plugindata.getConfigurationSection(getPluginName()); if (plugindata == null) plugindata =
* super.plugindata.createSection(getPluginName()); } protected void save() { plugindata = super.plugindata.createSection(getPluginName(), plugindata.getValues(true)); super.save(); }
*/
static { static {
addPlayerType(TBMCPlayerBase.class, FOLDER_NAME); addPlayerType(TBMCPlayerBase.class, FOLDER_NAME);
} }
@ -137,6 +130,7 @@ public abstract class TBMCPlayerBase extends ChromaGamerBase {
player.setPlayerName(p.getName()); player.setPlayerName(p.getName());
Bukkit.getLogger().info("Renaming done."); Bukkit.getLogger().info("Renaming done.");
} }
playermap.put(p.getUniqueId() + "-" + TBMCPlayer.class.getSimpleName(), player);
// Load in other plugins // Load in other plugins
Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerLoadEvent(player)); Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerLoadEvent(player));