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

Fixing some NPE and similar small issues.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-18 20:28:12 +02:00
parent 5ddfb19861
commit f70cc283db
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/massivecraft/factions/FPlayer.java
View File

@ -226,6 +226,7 @@ public class FPlayer extends SenderEntity<FPlayer> implements EconomyParticipato
// Next we must be attached and inited // Next we must be attached and inited
if (!this.attached()) return; if (!this.attached()) return;
if (!this.getColl().inited()) return; if (!this.getColl().inited()) return;
if (!FactionColl.get().inited()) return;
// Spout Derp // Spout Derp
SpoutFeatures.updateTitle(this, null); SpoutFeatures.updateTitle(this, null);
@ -375,12 +376,12 @@ public class FPlayer extends SenderEntity<FPlayer> implements EconomyParticipato
public double getPowerMax() public double getPowerMax()
{ {
return ConfServer.powerMax + this.powerBoost; return ConfServer.powerMax + this.getPowerBoost();
} }
public double getPowerMin() public double getPowerMin()
{ {
return ConfServer.powerMin + this.powerBoost; return ConfServer.powerMin + this.getPowerBoost();
} }
public void recalculatePower() public void recalculatePower()

1
src/com/massivecraft/factions/FPlayerColl.java
View File

@ -71,6 +71,7 @@ public class FPlayerColl extends SenderColl<FPlayer>
// If inited ... // If inited ...
if (!this.inited()) return ret; if (!this.inited()) return ret;
if (!FactionColl.get().inited()) return ret;
// ... update the index. // ... update the index.
Faction faction = entity.getFaction(); Faction faction = entity.getFaction();

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

@ -74,6 +74,7 @@ public class LWCFeatures
for (BlockState blockState : chunk.getTileEntities()) for (BlockState blockState : chunk.getTileEntities())
{ {
// TODO: Can something else be protected by LWC? Or is it really only chests? // TODO: Can something else be protected by LWC? Or is it really only chests?
// TODO: How about we run through each block in the chunk just to be on the safe side?
if (blockState.getType() != Material.CHEST) continue; if (blockState.getType() != Material.CHEST) continue;
Block block = blockState.getBlock(); Block block = blockState.getBlock();

2
src/com/massivecraft/factions/integration/Worldguard.java
View File

@ -10,7 +10,7 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import static com.sk89q.worldguard.bukkit.BukkitUtil.*; import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
import com.sk89q.worldguard.protection.flags.DefaultFlag; import com.sk89q.worldguard.protection.flags.DefaultFlag;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;

3
src/com/massivecraft/factions/integration/herochat/HerochatFeatures.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.factions.integration.herochat; package com.massivecraft.factions.integration.herochat;
import com.dthielke.herochat.Herochat;
import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract; import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract;
public class HerochatFeatures extends IntegrationFeaturesAbstract public class HerochatFeatures extends IntegrationFeaturesAbstract
@ -20,8 +19,6 @@ public class HerochatFeatures extends IntegrationFeaturesAbstract
@Override @Override
public void activate() public void activate()
{ {
Herochat.getChannelManager().addChannel(new FactionChannel());
Herochat.getChannelManager().addChannel(new AlliesChannel());
HerochatListener.get().activate(); HerochatListener.get().activate();
} }

4
src/com/massivecraft/factions/integration/herochat/HerochatListener.java
View File

@ -7,6 +7,7 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import com.dthielke.herochat.ChannelChatEvent; import com.dthielke.herochat.ChannelChatEvent;
import com.dthielke.herochat.Herochat;
import com.massivecraft.factions.ConfServer; import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.chat.ChatFormatter; import com.massivecraft.factions.chat.ChatFormatter;
@ -28,6 +29,9 @@ public class HerochatListener implements Listener
public void activate() public void activate()
{ {
Herochat.getChannelManager().addChannel(new FactionChannel());
Herochat.getChannelManager().addChannel(new AlliesChannel());
Bukkit.getPluginManager().registerEvents(this, Factions.get()); Bukkit.getPluginManager().registerEvents(this, Factions.get());
} }