mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-04-26 00:19:43 +00:00
Make /speed persist on world change if permissions exist.
This commit is contained in:
parent
1c035457bb
commit
b9d09dd7b0
1 changed files with 23 additions and 10 deletions
|
@ -161,9 +161,8 @@ public class EssentialsPlayerListener implements Listener
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
event.setQuitMessage(
|
event.setQuitMessage(
|
||||||
ess.getSettings().getCustomQuitMessage()
|
ess.getSettings().getCustomQuitMessage()
|
||||||
.replace("{PLAYER}", player.getDisplayName())
|
.replace("{PLAYER}", player.getDisplayName())
|
||||||
.replace("{USERNAME}", player.getName())
|
.replace("{USERNAME}", player.getName()));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
|
if (ess.getSettings().removeGodOnDisconnect() && user.isGodModeEnabled())
|
||||||
|
@ -195,7 +194,7 @@ public class EssentialsPlayerListener implements Listener
|
||||||
delayedJoin(event.getPlayer(), joinMessage);
|
delayedJoin(event.getPlayer(), joinMessage);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if(ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage())
|
if (ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage())
|
||||||
{
|
{
|
||||||
event.setJoinMessage(null);
|
event.setJoinMessage(null);
|
||||||
}
|
}
|
||||||
|
@ -260,11 +259,10 @@ public class EssentialsPlayerListener implements Listener
|
||||||
{
|
{
|
||||||
ess.getServer().broadcastMessage(
|
ess.getServer().broadcastMessage(
|
||||||
ess.getSettings().getCustomJoinMessage()
|
ess.getSettings().getCustomJoinMessage()
|
||||||
.replace("{PLAYER}", player.getDisplayName())
|
.replace("{PLAYER}", player.getDisplayName())
|
||||||
.replace("{USERNAME}", player.getName())
|
.replace("{USERNAME}", player.getName()));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
else if(ess.getSettings().allowSilentJoinQuit())
|
else if (ess.getSettings().allowSilentJoinQuit())
|
||||||
{
|
{
|
||||||
ess.getServer().broadcastMessage(message);
|
ess.getServer().broadcastMessage(message);
|
||||||
}
|
}
|
||||||
|
@ -474,8 +472,23 @@ public class EssentialsPlayerListener implements Listener
|
||||||
user.setFallDistance(0f);
|
user.setFallDistance(0f);
|
||||||
user.setAllowFlight(false);
|
user.setAllowFlight(false);
|
||||||
}
|
}
|
||||||
user.setFlySpeed(0.1f);
|
if (!user.isAuthorized("essentials.speed"))
|
||||||
user.setWalkSpeed(0.2f);
|
{
|
||||||
|
user.setFlySpeed(0.1f);
|
||||||
|
user.setWalkSpeed(0.2f);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (user.getFlySpeed() > ess.getSettings().getMaxFlySpeed() && !user.isAuthorized("essentials.speed.bypass"))
|
||||||
|
{
|
||||||
|
user.setFlySpeed((float)ess.getSettings().getMaxFlySpeed());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (user.getWalkSpeed() > ess.getSettings().getMaxWalkSpeed() && !user.isAuthorized("essentials.speed.bypass"))
|
||||||
|
{
|
||||||
|
user.setWalkSpeed((float)ess.getSettings().getMaxWalkSpeed());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
|
|
Loading…
Reference in a new issue