Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-19 16:55:21 +01:00
Code Issues Projects Releases Wiki Activity

minor changes to LWC integration

Browse Source
This commit is contained in:
Brettflan 2012-01-15 12:17:21 -06:00
parent 8321a3ec70
commit f5d2ac5aec
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/LWC.jar Normal file
View File

Binary file not shown.

2
plugin.yml
View File

@ -2,7 +2,7 @@ name: Factions
version: 1.6.3_dev
main: com.massivecraft.factions.P
authors: [Olof Larsson, Brett Flannigan]
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, nChat, ChatManager, CAPI, AuthMe, Register, Spout, WorldEdit, WorldGuard]
softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Register, Spout, WorldEdit, WorldGuard]
commands:
factions:
description: Reference command for Factions.

11
src/com/massivecraft/factions/P.java
View File

@ -14,10 +14,6 @@ import org.bukkit.event.Event;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.plugin.Plugin;
import com.earth2me.essentials.chat.EssentialsChat;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.griefcraft.lwc.LWCPlugin;
import com.massivecraft.factions.cmd.CmdAutoHelp;
import com.massivecraft.factions.cmd.FCmdRoot;
import com.massivecraft.factions.integration.Econ;
@ -35,6 +31,11 @@ import com.massivecraft.factions.struct.ChatMode;
import com.massivecraft.factions.util.MapFLocToStringSetTypeAdapter;
import com.massivecraft.factions.util.MyLocationTypeAdapter;
import com.massivecraft.factions.zcore.MPlugin;
import com.earth2me.essentials.chat.EssentialsChat;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.griefcraft.lwc.LWCPlugin;
import com.nijiko.permissions.PermissionHandler;
public class P extends MPlugin
@ -210,7 +211,7 @@ public class P extends MPlugin
Plugin test = this.getServer().getPluginManager().getPlugin("LWC");
if(test != null && test.isEnabled() && Conf.lwcIntegration)
if(test != null && test.isEnabled())
{
LWCFeatures.integrateLWC((LWCPlugin)test);
}

7
src/com/massivecraft/factions/integration/LWCFeatures.java
View File

@ -12,6 +12,7 @@ import org.bukkit.block.BlockState;
import com.griefcraft.lwc.LWC;
import com.griefcraft.lwc.LWCPlugin;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
@ -21,14 +22,12 @@ public class LWCFeatures
{
private static LWC lwc;
private static boolean isEnabled = false;
public static void integrateLWC(LWCPlugin test)
{
lwc = test.getLWC();
isEnabled = true;
P.p.log("Successfully hooked into LWC!");
P.p.log("Successfully hooked into LWC!"+(Conf.lwcIntegration ? "" : " Integration is currently disabled, though (\"lwcIntegration\")."));
}
public static void clearOtherChests(FLocation flocation, Faction faction)
@ -82,6 +81,6 @@ public class LWCFeatures
public static boolean getEnabled()
{
return isEnabled;
return Conf.lwcIntegration && lwc != null;
}
}