minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00
Code Issues Releases Wiki Activity

Fixing speed and enderchest on 3.0

Browse Source
This commit is contained in:
ementalo
2012-08-29 11:51:36 +01:00
parent caa67e4207
commit 1b725c7999
7 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/net/ess3/api/IUser.java
View File

@@ -114,6 +114,10 @@ public interface IUser extends OfflinePlayer, CommandSender, IStorageObjectHolde
boolean isInvSee();
void setInvSee(boolean invsee);
boolean isEnderSee();
void setEnderSee(boolean endersee);
boolean hasInvulnerabilityAfterTeleport();

14
Essentials/src/net/ess3/commands/Commandenderchest.java
View File

@@ -1,24 +1,24 @@
package net.ess3.commands;
import net.ess3.user.User;
import org.bukkit.Server;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
public class Commandenderchest extends EssentialsCommand
{
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{
if (args.length > 0 && user.isAuthorized("essentials.enderchest.others"))
if (args.length > 0 && Permissions.ENDERCHEST_OTHERS.isAuthorized(user))
{
final User invUser = getPlayer(server, args, 0);
user.openInventory(invUser.getEnderChest());
final IUser invUser = ess.getUserMap().getUser(args[0]);
user.getPlayer().openInventory(invUser.getPlayer().getEnderChest());
user.setEnderSee(true);
}
else
{
user.openInventory(user.getEnderChest());
user.getPlayer().openInventory(user.getPlayer().getEnderChest());
user.setEnderSee(false);
}

28
Essentials/src/net/ess3/commands/Commandspeed.java
View File

@@ -1,6 +1,8 @@
package net.ess3.commands;
import net.ess3.user.User;
import static net.ess3.I18n._;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -10,7 +12,7 @@ public class Commandspeed extends EssentialsCommand
{
@Override
protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
if (args.length < 2)
{
@@ -22,7 +24,7 @@ public class Commandspeed extends EssentialsCommand
}
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{
if (args.length < 1)
{
@@ -31,7 +33,7 @@ public class Commandspeed extends EssentialsCommand
boolean isFly;
float speed;
boolean isBypass = user.isAuthorized("essentials.speed.bypass");
boolean isBypass = Permissions.SPEED_BYPASS.isAuthorized(user);
if (args.length == 1)
{
//isFly = user.isFlying();
@@ -49,7 +51,7 @@ public class Commandspeed extends EssentialsCommand
//}
isFly = true;
speed = getMoveSpeed(args[0]);
if (user.isAuthorized("essentials.speed.others"))
if (Permissions.SPEED_OTHERS.isAuthorized(user))
{
speedOtherPlayers(server, user, isFly, isBypass, speed, args[1]);
return;
@@ -58,8 +60,8 @@ public class Commandspeed extends EssentialsCommand
//if (isFly)
//{
user.setFlySpeed(getRealMoveSpeed(speed, isFly, isBypass));
user.sendMessage(_("moveSpeed", _("flying"), speed, user.getDisplayName()));
user.getPlayer().setFlySpeed(getRealMoveSpeed(speed, isFly, isBypass));
user.sendMessage(_("moveSpeed", _("flying"), speed, user.getPlayer().getDisplayName()));
//}
//else
//{
@@ -77,11 +79,11 @@ public class Commandspeed extends EssentialsCommand
matchPlayer.setFlySpeed(getRealMoveSpeed(speed, isFly, isBypass));
sender.sendMessage(_("moveSpeed", _("flying"), speed, matchPlayer.getDisplayName()));
}
else
{
matchPlayer.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass));
sender.sendMessage(_("moveSpeed", _("walking"), speed, matchPlayer.getDisplayName()));
}
//else
// {
// matchPlayer.setWalkSpeed(getRealMoveSpeed(speed, isFly, isBypass));
// sender.sendMessage(_("moveSpeed", _("walking"), speed, matchPlayer.getDisplayName()));
// }
}
}
@@ -132,7 +134,7 @@ public class Commandspeed extends EssentialsCommand
float maxSpeed = 1f;
if (!isBypass)
{
maxSpeed = (float)(isFly ? ess.getSettings().getMaxFlySpeed() : ess.getSettings().getMaxWalkSpeed());
maxSpeed = ess.getSettings().getData().getCommands().getSpeed().getMaxFlySpeed();// : ess.getSettings().ess.getSettings().getData().getCommands().getSpeed()getMaxWalkSpeed());
}
if (userSpeed < 1f)

5
Essentials/src/net/ess3/permissions/Permissions.java
View File

@@ -25,6 +25,7 @@ public enum Permissions implements IPermission
CLEARINVENTORY_OTHERS,
DELHOME_OTHERS,
ECO_LOAN(PermissionDefault.FALSE),
ENDERCHEST_OTHERS,
EXP_GIVE,
EXP_GIVE_OTHERS,
EXP_SET,
@@ -72,6 +73,8 @@ public enum Permissions implements IPermission
SETHOME_OTHERS,
SLEEPINGIGNORED,
SPAWN_OTHERS,
SPEED_BYPASS,
SPEED_OTHERS,
SUDO_EXEMPT,
TELEPORT_COOLDOWN_BYPASS,
TELEPORT_HIDDEN,
@@ -101,7 +104,7 @@ public enum Permissions implements IPermission
}
private Permissions(final PermissionDefault defaultPerm)
{
{
permission = base + toString().toLowerCase(Locale.ENGLISH).replace('_', '.');
this.defaultPerm = defaultPerm;
}

1
Essentials/src/net/ess3/settings/Commands.java
View File

@@ -23,6 +23,7 @@ public class Commands implements StorageObject
private net.ess3.settings.commands.List list = new net.ess3.settings.commands.List();
private Spawnmob spawnmob = new Spawnmob();
private Tpa tpa = new Tpa();
private Speed speed = new Speed();
@ListType
@Comment(
{

17
Essentials/src/net/ess3/settings/commands/Speed.java Normal file
View File

@@ -0,0 +1,17 @@
package net.ess3.settings.commands;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.ess3.storage.Comment;
import net.ess3.storage.StorageObject;
@Data
@EqualsAndHashCode(callSuper = false)
public class Speed implements StorageObject
{
@Comment({"#Set the max fly speed, values range from 0.1 to 1.0"})
private float maxFlySpeed = 1.0f;
/*@Comment({"#Set the max walk speed, values range from 0.1 to 1.0"})
private float maxWalkSpeed = 0.8f;*/
}

3
Essentials/src/net/ess3/user/User.java
View File

@@ -48,6 +48,9 @@ public class User extends UserBase implements IUser
@Getter
@Setter
private boolean invSee = false;
@Getter
@Setter
private boolean enderSee = false;
private transient Location afkPosition;
private AtomicBoolean gotMailInfo = new AtomicBoolean(false);
private WeakReference<Player> playerCache;