SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Version change

Browse Source
This commit is contained in:
ProSavage 2018-10-17 16:32:47 -05:00
parent f425663563
commit 4c89fff7de
2 changed files with 898 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -17,7 +17,6 @@ import com.massivecraft.factions.util.FactionGUI;
import com.massivecraft.factions.util.Particles.ParticleEffect; import com.massivecraft.factions.util.Particles.ParticleEffect;
import com.massivecraft.factions.util.VisualizeUtil; import com.massivecraft.factions.util.VisualizeUtil;
import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.Access;
import com.massivecraft.factions.zcore.fperms.Permissable;
import com.massivecraft.factions.zcore.fperms.PermissableAction; import com.massivecraft.factions.zcore.fperms.PermissableAction;
import com.massivecraft.factions.zcore.persist.MemoryFPlayer; import com.massivecraft.factions.zcore.persist.MemoryFPlayer;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
@ -306,8 +305,9 @@ public class FactionsPlayerListener implements Listener {
Access access = otherFaction.getAccess(me, action); Access access = otherFaction.getAccess(me, action);
boolean doTerritoryEnemyProtectedCheck = true; boolean doTerritoryEnemyProtectedCheck = true;
if (action.equals(PermissableAction.CONTAINER) || if (action.equals(PermissableAction.CONTAINER) ||
action.equals(PermissableAction.DOOR)) { (action.equals(PermissableAction.DOOR))) {
if (access == Access.ALLOW) { if (access == Access.ALLOW) {
doTerritoryEnemyProtectedCheck = false; doTerritoryEnemyProtectedCheck = false;
} }
@ -326,7 +326,6 @@ public class FactionsPlayerListener implements Listener {
} }
if (access != Access.ALLOW && me.getRole() != Role.ADMIN) { if (access != Access.ALLOW && me.getRole() != Role.ADMIN) {
// TODO: Update this once new access values are added other than just allow / deny. // TODO: Update this once new access values are added other than just allow / deny.
if ((myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) { if ((myFaction.getOwnerListString(loc) != null && ! myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) {
@ -628,7 +627,6 @@ public class FactionsPlayerListener implements Listener {
} }
@EventHandler (priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler (priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
@ -941,6 +939,7 @@ public class FactionsPlayerListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler (priority = EventPriority.HIGH) @EventHandler (priority = EventPriority.HIGH)
public void onPlayerRespawn(PlayerRespawnEvent event) { public void onPlayerRespawn(PlayerRespawnEvent event) {
FPlayer me = FPlayers.getInstance().getByPlayer(event.getPlayer()); FPlayer me = FPlayers.getInstance().getByPlayer(event.getPlayer());

2
src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: Factions name: Factions
version: ${project.version}-1.4-RC-2 version: ${project.version}-1.4-RC-3
api-version: 1.13 api-version: 1.13
main: com.massivecraft.factions.P main: com.massivecraft.factions.P
authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, AL56AF50] authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, AL56AF50]