This commit is contained in:
Olof Larsson
2016-10-09 10:59:43 +02:00
parent 19229ac221
commit 9bca51b470
18 changed files with 348 additions and 41 deletions

View File

@ -124,7 +124,7 @@ public class CmdFactionsJoin extends FactionsCommand
// Apply
mplayer.resetFactionData();
mplayer.setFaction(faction);
faction.setInvited(mplayer, false);
// Derplog

View File

@ -261,7 +261,7 @@ public class CmdFactionsRank extends FactionsCommand
}
else
{
// Derp is a member in Faction
// Derp is a member in Faction
msg("%s <i>%s %s <h>%s <i>%s %s<i>.", targetName, isAre, theAan, rankName, ofIn, factionName);
}
}

View File

@ -74,7 +74,7 @@ public class EngineExploit extends Engine
((mat == Material.THIN_GLASS || mat == Material.IRON_FENCE) && clippingThrough(target, from, 0.65))
|| ((mat == Material.FENCE || mat == Material.NETHER_FENCE) && clippingThrough(target, from, 0.45))
)
{
{
event.setTo(from);
return;
}

View File

@ -55,19 +55,19 @@ public class EventFactionsMembershipChange extends EventFactionsAbstractSender
public enum MembershipChangeReason
{
// Join
JOIN (true),
CREATE (false),
JOIN (true),
CREATE (false),
// Leader is not used, but temporarily kept to avoid other plugins crashing
@Deprecated
LEADER (true),
RANK (true),
LEADER (true),
RANK (true),
// Leave
LEAVE (true),
LEAVE (true),
//JOINOTHER (true),
KICK (true),
DISBAND (false),
//RESET (false),
KICK (true),
DISBAND (false),
//RESET (false),
;
private final boolean cancellable;

View File

@ -93,7 +93,7 @@ public abstract class ChannelFactionsAbstract implements Channel
}
}
return true;
return true;
}
@Override