EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Event first

Browse Source
This commit is contained in:
Olof Larsson
2014-06-04 16:47:01 +02:00
parent e43f63cf59
commit 56768aca55
38 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/massivecraft/factions/entity/UConf.java
View File

@ -12,7 +12,7 @@ import org.bukkit.event.EventPriority;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.event.FactionsEventChunkChangeType;
import com.massivecraft.factions.event.EventFactionsChunkChangeType;
import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.store.SenderEntity;
import com.massivecraft.massivecore.util.MUtil;
@ -219,11 +219,11 @@ public class UConf extends Entity<UConf>
// INTEGRATION: LWC
// -------------------------------------------- //
public Map<FactionsEventChunkChangeType, Boolean> lwcRemoveOnChange = MUtil.map(
FactionsEventChunkChangeType.BUY, false,
FactionsEventChunkChangeType.SELL, false,
FactionsEventChunkChangeType.CONQUER, false,
FactionsEventChunkChangeType.PILLAGE, false
public Map<EventFactionsChunkChangeType, Boolean> lwcRemoveOnChange = MUtil.map(
EventFactionsChunkChangeType.BUY, false,
EventFactionsChunkChangeType.SELL, false,
EventFactionsChunkChangeType.CONQUER, false,
EventFactionsChunkChangeType.PILLAGE, false
);
// -------------------------------------------- //
@ -237,11 +237,11 @@ public class UConf extends Entity<UConf>
public String econUniverseAccount = "";
public Map<FactionsEventChunkChangeType, Double> econChunkCost = MUtil.map(
FactionsEventChunkChangeType.BUY, 30.0,
FactionsEventChunkChangeType.SELL, -20.0,
FactionsEventChunkChangeType.CONQUER, -10.0,
FactionsEventChunkChangeType.PILLAGE, -10.0
public Map<EventFactionsChunkChangeType, Double> econChunkCost = MUtil.map(
EventFactionsChunkChangeType.BUY, 30.0,
EventFactionsChunkChangeType.SELL, -20.0,
EventFactionsChunkChangeType.CONQUER, -10.0,
EventFactionsChunkChangeType.PILLAGE, -10.0
);
public double econCostCreate = 200.0;

10
src/com/massivecraft/factions/entity/UPlayer.java
View File

@ -13,9 +13,9 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Lang;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.event.FactionsEventChunkChange;
import com.massivecraft.factions.event.FactionsEventMembershipChange;
import com.massivecraft.factions.event.FactionsEventMembershipChange.MembershipChangeReason;
import com.massivecraft.factions.event.EventFactionsChunkChange;
import com.massivecraft.factions.event.EventFactionsMembershipChange;
import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.ps.PS;
@ -620,7 +620,7 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
}
// Event
FactionsEventMembershipChange membershipChangeEvent = new FactionsEventMembershipChange(this.getSender(), this, myFaction, MembershipChangeReason.LEAVE);
EventFactionsMembershipChange membershipChangeEvent = new EventFactionsMembershipChange(this.getSender(), this, myFaction, MembershipChangeReason.LEAVE);
membershipChangeEvent.run();
if (membershipChangeEvent.isCancelled()) return;
@ -760,7 +760,7 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
}
// Event
FactionsEventChunkChange event = new FactionsEventChunkChange(sender, chunk, newFaction);
EventFactionsChunkChange event = new EventFactionsChunkChange(sender, chunk, newFaction);
event.run();
if (event.isCancelled()) return false;