EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Documentation and Flag Changes.

Browse Source
This commit is contained in:
MattBDev
2016-06-04 17:19:37 -04:00
parent 17ff6a7e1d
commit 70aaa984e2
15 changed files with 130 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Sponge/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java
View File

@ -11,7 +11,6 @@ import com.plotsquared.sponge.util.SpongeUtil;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.data.manipulator.mutable.TargetedLocationData;
import org.spongepowered.api.data.value.mutable.Value;
import org.spongepowered.api.effect.sound.SoundTypes;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.entity.living.player.gamemode.GameMode;
@ -21,7 +20,7 @@ import org.spongepowered.api.text.chat.ChatTypes;
import org.spongepowered.api.text.serializer.TextSerializers;
import org.spongepowered.api.world.World;
import java.time.Instant;
import java.util.Optional;
import java.util.UUID;
public class SpongePlayer extends PlotPlayer {
@ -29,7 +28,6 @@ public class SpongePlayer extends PlotPlayer {
public final Player player;
private UUID uuid;
private String name;
private long last = 0;
public SpongePlayer(Player player) {
this.player = player;
@ -40,19 +38,7 @@ public class SpongePlayer extends PlotPlayer {
public RequiredType getSuperCaller() {
return RequiredType.PLAYER;
}
@Override
public long getPreviousLogin() {
if (this.last != 0) {
return this.last;
}
Value<Instant> data = this.player.getJoinData().lastPlayed();
if (data.exists()) {
return this.last = data.get().getEpochSecond() * 1000;
}
return 0;
}
@Override
public Location getLocation() {
Location location = super.getLocation();
@ -75,7 +61,11 @@ public class SpongePlayer extends PlotPlayer {
}
return this.uuid;
}
@Override public long getLastPlayed() {
return this.player.lastPlayed().get().toEpochMilli();
}
@Override
public boolean hasPermission(String permission) {
return this.player.hasPermission(permission);
@ -234,7 +224,7 @@ public class SpongePlayer extends PlotPlayer {
@Override
public boolean isBanned() {
BanService service = Sponge.getServiceManager().provide(BanService.class).get();
return service.isBanned(this.player.getProfile());
Optional<BanService> service = Sponge.getServiceManager().provide(BanService.class);
return service.isPresent() && service.get().isBanned(this.player.getProfile());
}
}

10
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
View File

@ -15,7 +15,6 @@ import com.intellectualcrafters.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.intellectualcrafters.plot.util.WorldUtil;
import com.plotsquared.sponge.SpongeMain;
import com.plotsquared.sponge.object.SpongePlayer;
import net.minecraft.block.Block;
import net.minecraft.world.biome.Biome;
@ -46,6 +45,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@ -246,11 +246,9 @@ public class SpongeUtil extends WorldUtil {
}
public static org.spongepowered.api.world.Location<World> getLocation(Location location) {
Optional<World> world = SpongeMain.THIS.getServer().getWorld(location.getWorld());
if (!world.isPresent()) {
return null;
}
return new org.spongepowered.api.world.Location<>(world.get(), location.getX(), location.getY(), location.getZ());
Collection<World> worlds = Sponge.getServer().getWorlds();
World world = Sponge.getServer().getWorld(location.getWorld()).orElse(worlds.toArray(new World[worlds.size()])[0]);
return new org.spongepowered.api.world.Location<>(world, location.getX(), location.getY(), location.getZ());
}
public static Location getLocation(String world, Vector3i position) {