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

Sponge stuff + done flag

Browse Source
This commit is contained in:
boy0001
2015-08-14 08:52:31 +10:00
parent 393a85c1bc
commit ccbd2ab30f
19 changed files with 211 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -678,7 +678,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_DESTROY_OTHER);
event.setCancelled(true);
}
else if (FlagManager.isPlotFlagTrue(plot, "done")) {
else if (plot.getSettings().flags.containsKey("done")) {
if (!Permissions.hasPermission(pp, PERMISSION_ADMIN_BUILD_OTHER)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_BUILD_OTHER);
event.setCancelled(true);
@ -2077,7 +2077,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
return;
}
}
else if (FlagManager.isPlotFlagTrue(plot, "done")) {
else if (plot.getSettings().flags.containsKey("done")) {
if (!Permissions.hasPermission(pp, PERMISSION_ADMIN_BUILD_OTHER)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_BUILD_OTHER);
event.setCancelled(true);

24
src/main/java/com/plotsquared/sponge/listener/MainListener.java
View File

@ -507,8 +507,8 @@ public class MainListener {
event.setCancelled(true);
return;
}
final PlotPlayer pp = SpongeUtil.getPlayer(player);
if (!plot.hasOwner()) {
final PlotPlayer pp = SpongeUtil.getPlayer(player);
if (Permissions.hasPermission(pp, PERMISSION_ADMIN_DESTROY_UNOWNED)) {
return;
}
@ -516,8 +516,7 @@ public class MainListener {
event.setCancelled(true);
return;
}
final PlotPlayer pp = SpongeUtil.getPlayer(player);
if (!plot.isAdded(pp.getUUID())) {
else if (!plot.isAdded(pp.getUUID())) {
final Flag destroy = FlagManager.getPlotFlag(plot, "break");
BlockState state = blockLoc.getBlock();
if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) {
@ -529,6 +528,13 @@ public class MainListener {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_DESTROY_OTHER);
event.setCancelled(true);
}
else if (plot.getSettings().flags.containsKey("done")) {
if (!Permissions.hasPermission(pp, PERMISSION_ADMIN_BUILD_OTHER)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_BUILD_OTHER);
event.setCancelled(true);
return;
}
}
return;
}
final PlotPlayer pp = SpongeUtil.getPlayer(player);
@ -554,8 +560,8 @@ public class MainListener {
event.setCancelled(true);
return;
}
final PlotPlayer pp = SpongeUtil.getPlayer(player);
if (!plot.hasOwner()) {
final PlotPlayer pp = SpongeUtil.getPlayer(player);
if (Permissions.hasPermission(pp, PERMISSION_ADMIN_BUILD_UNOWNED)) {
return;
}
@ -563,8 +569,7 @@ public class MainListener {
event.setCancelled(true);
return;
}
final PlotPlayer pp = SpongeUtil.getPlayer(player);
if (!plot.isAdded(pp.getUUID())) {
else if (!plot.isAdded(pp.getUUID())) {
final Flag destroy = FlagManager.getPlotFlag(plot, "place");
BlockState state = blockLoc.getBlock();
if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) {
@ -576,6 +581,13 @@ public class MainListener {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_DESTROY_OTHER);
event.setCancelled(true);
}
else if (plot.getSettings().flags.containsKey("done")) {
if (!Permissions.hasPermission(pp, PERMISSION_ADMIN_BUILD_OTHER)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, PERMISSION_ADMIN_BUILD_OTHER);
event.setCancelled(true);
return;
}
}
return;
}
final PlotPlayer pp = SpongeUtil.getPlayer(player);

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

@ -2,9 +2,11 @@ package com.plotsquared.sponge.object;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.data.manipulator.mutable.TargetedLocationData;
import org.spongepowered.api.data.manipulator.mutable.entity.GameModeData;
import org.spongepowered.api.data.value.mutable.Value;
import org.spongepowered.api.entity.player.Player;
@ -130,8 +132,8 @@ public class SpongePlayer extends PlotPlayer {
@Override
public void setCompassTarget(Location loc) {
// TODO set compass target
throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
TargetedLocationData target = player.getOrCreate(TargetedLocationData.class).get();
target.set(Keys.TARGETED_LOCATION, SpongeUtil.getLocation(loc));
}
@Override
@ -175,7 +177,6 @@ public class SpongePlayer extends PlotPlayer {
@Override
public PlotGamemode getGamemode() {
// TODO Auto-generated method stub
GameMode gamemode = player.getGameModeData().type().get();
if (gamemode == GameModes.ADVENTURE) {
return PlotGamemode.ADVENTURE;

17
src/main/java/com/plotsquared/sponge/util/SpongeBlockManager.java
View File

@ -10,13 +10,11 @@ import org.spongepowered.api.block.tileentity.Sign;
import org.spongepowered.api.block.tileentity.TileEntity;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.data.manipulator.mutable.tileentity.SignData;
import org.spongepowered.api.data.value.immutable.ImmutableListValue;
import org.spongepowered.api.data.value.mutable.ListValue;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.world.World;
import org.spongepowered.api.world.biome.BiomeType;
import org.spongepowered.api.world.biome.BiomeTypes;
import org.spongepowered.common.data.value.mutable.SpongeListValue;
import com.google.common.base.Optional;
import com.intellectualcrafters.plot.object.Location;
@ -153,12 +151,12 @@ public class SpongeBlockManager extends BlockManager {
return null;
}
Sign sign = (Sign) tile;
Optional<List<Text>> optional = tile.get(Keys.SIGN_LINES);
Optional<SignData> optional = sign.getOrCreate(SignData.class);
if (!optional.isPresent()) {
return null;
}
String[] result = new String[4];
List<Text> lines = optional.get();
ListValue<Text> lines = optional.get().lines();
for (int i = 0; i < 4; i++) {
result[i] = lines.get(i).toString();
}
@ -195,8 +193,15 @@ public class SpongeBlockManager extends BlockManager {
text.add(SpongeMain.THIS.getText(lines[i]));
}
try {
SpongeListValue<Text> offering = new SpongeListValue<Text>(Keys.SIGN_LINES, text);
sign.offer(offering);
Optional<SignData> optional = sign.getOrCreate(SignData.class);
if(optional.isPresent()) {
SignData offering = optional.get();
offering.lines().set(0, SpongeMain.THIS.getText(lines[0]));
offering.lines().set(1, SpongeMain.THIS.getText(lines[1]));
offering.lines().set(2, SpongeMain.THIS.getText(lines[2]));
offering.lines().set(3, SpongeMain.THIS.getText(lines[3]));
sign.offer(offering);
}
}
catch (NullPointerException e) {
e.printStackTrace();

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

@ -102,4 +102,12 @@ public class SpongeUtil {
}
return null;
}
public static org.spongepowered.api.world.Location getLocation(Location loc) {
Optional<World> world = SpongeMain.THIS.getServer().getWorld(loc.getWorld());
if (!world.isPresent()) {
return null;
}
return new org.spongepowered.api.world.Location(world.get(), loc.getX(), loc.getY(), loc.getZ());
}
}

3
src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java
View File

@ -16,7 +16,6 @@ public class SpongeUUIDHandler extends UUIDHandlerImplementation {
public SpongeUUIDHandler(UUIDWrapper wrapper) {
super(wrapper);
// TODO Auto-generated constructor stub
}
@Override
@ -28,8 +27,6 @@ public class SpongeUUIDHandler extends UUIDHandlerImplementation {
}
public boolean cache(Runnable whenDone) {
// TODO cache UUIDS
// SpongeMain.THIS.getRegistry().get
add(new StringWrapper("*"), DBFunc.everyone);
for (GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles()) {
add(new StringWrapper(profile.getName()), profile.getUniqueId());