Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-26 19:18:37 +01:00
Code Issues Projects Releases Wiki Activity

added incompatibility error prevention

Browse Source
This commit is contained in:
aPunch 2012-01-29 14:58:19 -06:00
parent b96e033f87
commit 9728521ea7
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/net/citizensnpcs/Citizens.java
View File

@ -7,6 +7,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.logging.Level;
import net.citizensnpcs.Settings.Setting;
import net.citizensnpcs.api.CitizensAPI;
@ -36,24 +37,28 @@ import net.citizensnpcs.storage.database.DatabaseStorage;
import net.citizensnpcs.storage.flatfile.YamlStorage;
import net.citizensnpcs.util.Messaging;
import net.citizensnpcs.util.StringHelper;
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.java.JavaPlugin;
public class Citizens extends JavaPlugin {
private static Storage saves;
private static final String COMPATIBLE_MC_VERSION = "1.1";
private volatile CitizensNPCManager npcManager;
private final InstanceFactory<Character> characterManager = new DefaultInstanceFactory<Character>();
private final InstanceFactory<Trait> traitManager = new DefaultInstanceFactory<Trait>();
private CommandManager cmdManager;
private Settings config;
private Storage saves;
private boolean skipDisable = false;
@Override
public boolean onCommand(CommandSender sender, Command cmd, String cmdName, String[] args) {
@ -113,18 +118,30 @@ public class Citizens extends JavaPlugin {
@Override
public void onDisable() {
// Save and despawn all NPCs
config.save();
saveNPCs();
for (NPC npc : npcManager)
npc.despawn();
Bukkit.getScheduler().cancelTasks(this);
// Don't bother with this part if MC versions are not compatible
if (!skipDisable) {
config.save();
saveNPCs();
for (NPC npc : npcManager)
npc.despawn();
Bukkit.getScheduler().cancelTasks(this);
}
Messaging.log("v" + getDescription().getVersion() + " disabled.");
}
@Override
public void onEnable() {
// Disable if the server is not using the compatible Minecraft version
String mcVersion = ((MinecraftServer) ((CraftServer) getServer()).getServer()).getVersion();
if (!mcVersion.equals(COMPATIBLE_MC_VERSION)) {
Messaging.log(Level.SEVERE, "v" + getDescription().getVersion() + " is not compatible with Minecraft v"
+ mcVersion + ". Disabling.");
skipDisable = true;
getServer().getPluginManager().disablePlugin(this);
return;
}
// Configuration file
config = new Settings(this);
config.load();
@ -158,11 +175,11 @@ public class Citizens extends JavaPlugin {
try {
setupNPCs();
} catch (NPCLoadException ex) {
Messaging.log("Issue when loading NPCs: " + ex.getMessage());
Messaging.log(Level.SEVERE, "Issue when loading NPCs: " + ex.getMessage());
}
}
}) == -1) {
Messaging.log("Issue enabling plugin. Disabling.");
Messaging.log(Level.SEVERE, "Issue enabling plugin. Disabling.");
getServer().getPluginManager().disablePlugin(this);
}
}

2
src/net/citizensnpcs/npc/CitizensNPCManager.java
View File

@ -12,6 +12,7 @@ import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
import net.citizensnpcs.resource.lib.CraftNPC;
import net.citizensnpcs.storage.Storage;
import net.citizensnpcs.util.ByIdArray;
import net.citizensnpcs.util.Messaging;
import net.minecraft.server.ItemInWorldManager;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.Packet29DestroyEntity;
@ -81,6 +82,7 @@ public class CitizensNPCManager implements NPCManager {
@Override
public NPC getNPC(Entity entity) {
Messaging.log("Version: " + getMinecraftServer(Bukkit.getServer()).getVersion());
for (NPC npc : npcs)
if (npc.isSpawned() && npc.getBukkitEntity().getEntityId() == entity.getEntityId())
return npc;