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

Some changes

Browse Source 
Fixes #605
Possibly #604
Other minor tweaks
This commit is contained in:
boy0001
2015-09-03 15:45:25 +10:00
parent 3a29022d19
commit afef79ea66
31 changed files with 195 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/plotsquared/sponge/SpongeMain.java
View File

@ -20,11 +20,8 @@ import org.spongepowered.api.Server;
import org.spongepowered.api.block.BlockState;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.event.Subscribe;
import org.spongepowered.api.event.entity.player.PlayerChatEvent;
import org.spongepowered.api.event.state.PreInitializationEvent;
import org.spongepowered.api.event.state.ServerAboutToStartEvent;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.entity.living.player.PlayerChatEvent;
import org.spongepowered.api.plugin.Plugin;
import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.service.profile.GameProfileResolver;
@ -37,6 +34,7 @@ import org.spongepowered.api.world.GeneratorTypes;
import org.spongepowered.api.world.World;
import com.google.common.base.Optional;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import com.intellectualcrafters.configuration.ConfigurationSection;
import com.intellectualcrafters.plot.IPlotMain;

2
src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.sponge.events;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Cancellable;
import com.intellectualcrafters.plot.object.Plot;

2
src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.sponge.events;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import com.intellectualcrafters.plot.object.Plot;

2
src/main/java/com/plotsquared/sponge/events/PlayerEvent.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.sponge.events;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.AbstractEvent;
public abstract class PlayerEvent extends AbstractEvent {

2
src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.sponge.events;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import com.intellectualcrafters.plot.object.Plot;

2
src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java
View File

@ -2,7 +2,7 @@ package com.plotsquared.sponge.events;
import java.util.UUID;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import com.intellectualcrafters.plot.object.Plot;

2
src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java
View File

@ -2,7 +2,7 @@ package com.plotsquared.sponge.events;
import java.util.UUID;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import com.intellectualcrafters.plot.object.Plot;

2
src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java
View File

@ -2,7 +2,7 @@ package com.plotsquared.sponge.events;
import java.util.UUID;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import com.intellectualcrafters.plot.object.Plot;

2
src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java
View File

@ -1,6 +1,6 @@
package com.plotsquared.sponge.events;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Cancellable;
import com.intellectualcrafters.plot.object.Location;

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

@ -12,29 +12,13 @@ import org.spongepowered.api.entity.living.Ambient;
import org.spongepowered.api.entity.living.Living;
import org.spongepowered.api.entity.living.animal.Animal;
import org.spongepowered.api.entity.living.monster.Monster;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.entity.vehicle.Boat;
import org.spongepowered.api.entity.vehicle.minecart.Minecart;
import org.spongepowered.api.event.Subscribe;
import org.spongepowered.api.event.block.BlockMoveEvent;
import org.spongepowered.api.event.block.BlockRedstoneUpdateEvent;
import org.spongepowered.api.event.block.FloraGrowEvent;
import org.spongepowered.api.event.block.FluidSpreadEvent;
import org.spongepowered.api.event.entity.EntityChangeBlockEvent;
import org.spongepowered.api.event.entity.EntitySpawnEvent;
import org.spongepowered.api.event.entity.EntityTeleportEvent;
import org.spongepowered.api.event.entity.player.PlayerBreakBlockEvent;
import org.spongepowered.api.event.entity.player.PlayerChangeWorldEvent;
import org.spongepowered.api.event.entity.player.PlayerChatEvent;
import org.spongepowered.api.event.entity.player.PlayerInteractBlockEvent;
import org.spongepowered.api.event.entity.player.PlayerJoinEvent;
import org.spongepowered.api.event.entity.player.PlayerMoveEvent;
import org.spongepowered.api.event.entity.player.PlayerPlaceBlockEvent;
import org.spongepowered.api.event.entity.player.PlayerQuitEvent;
import org.spongepowered.api.event.message.CommandEvent;
import org.spongepowered.api.event.network.PlayerConnectionEvent;
import org.spongepowered.api.event.world.ChunkPreGenerateEvent;
import org.spongepowered.api.event.world.WorldOnExplosionEvent;
import org.spongepowered.api.event.entity.living.player.PlayerChatEvent;
import org.spongepowered.api.event.entity.living.player.PlayerConnectionEvent;
import org.spongepowered.api.event.entity.living.player.PlayerJoinEvent;
import org.spongepowered.api.event.entity.living.player.PlayerQuitEvent;
import org.spongepowered.api.network.PlayerConnection;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.Texts;
@ -46,6 +30,7 @@ import org.spongepowered.api.world.extent.Extent;
import com.flowpowered.math.vector.Vector3d;
import com.flowpowered.math.vector.Vector3i;
import com.google.common.base.Predicate;
import com.google.common.eventbus.Subscribe;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
@ -726,10 +711,10 @@ public class MainListener {
if (!PlotListener.plotExit(pp, lastPlot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(world.getSpawnLocation());
event.setTo(world.getSpawnLocation());
}
return;
}
@ -742,10 +727,10 @@ public class MainListener {
if (!PlotListener.plotEntry(pp, plot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(world.getSpawnLocation());
event.setTo(world.getSpawnLocation());
}
return;
}
@ -755,13 +740,13 @@ public class MainListener {
if (x2 > border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(border - 4, pos.getY(), pos.getZ()));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
else if (x2 < -border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(-border + 4, pos.getY(), pos.getZ()));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
}
@ -793,10 +778,10 @@ public class MainListener {
if (!PlotListener.plotExit(pp, lastPlot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(world.getSpawnLocation());
event.setTo(world.getSpawnLocation());
}
return;
}
@ -809,10 +794,10 @@ public class MainListener {
if (!PlotListener.plotEntry(pp, plot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(world.getSpawnLocation());
event.setTo(world.getSpawnLocation());
}
return;
}
@ -822,13 +807,13 @@ public class MainListener {
if (z2 > border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), border - 4));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
else if (z2 < -border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), -border + 4));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
}
@ -867,10 +852,10 @@ public class MainListener {
if (!PlotListener.plotExit(pp, lastPlot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(world.getSpawnLocation());
event.setTo(world.getSpawnLocation());
}
return;
}
@ -883,10 +868,10 @@ public class MainListener {
if (!PlotListener.plotEntry(pp, plot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(world.getSpawnLocation());
event.setTo(world.getSpawnLocation());
}
return;
}
@ -896,13 +881,13 @@ public class MainListener {
if (x2 > border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(border - 4, pos.getY(), pos.getZ()));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
else if (x2 < -border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(-border + 4, pos.getY(), pos.getZ()));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
}
@ -934,10 +919,10 @@ public class MainListener {
if (!PlotListener.plotExit(pp, lastPlot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(player.getWorld().getSpawnLocation());
event.setTo(player.getWorld().getSpawnLocation());
}
return;
}
@ -950,10 +935,10 @@ public class MainListener {
if (!PlotListener.plotEntry(pp, plot)) {
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
event.setNewLocation(from);
event.setTo(from);
}
else {
event.setNewLocation(player.getWorld().getSpawnLocation());
event.setTo(player.getWorld().getSpawnLocation());
}
return;
}
@ -963,13 +948,13 @@ public class MainListener {
if (z2 > border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), border - 4));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
else if (z2 < -border) {
Vector3d pos = to.getPosition();
to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), -border + 4));
event.setNewLocation(to);
event.setTo(to);
MainUtil.sendMessage(pp, C.BORDER);
}
}

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

@ -7,9 +7,9 @@ import java.util.UUID;
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.entity.player.Player;
import org.spongepowered.api.entity.player.gamemode.GameMode;
import org.spongepowered.api.entity.player.gamemode.GameModes;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.entity.living.player.gamemode.GameMode;
import org.spongepowered.api.entity.living.player.gamemode.GameModes;
import org.spongepowered.api.text.TextBuilder;
import org.spongepowered.api.text.Texts;
import org.spongepowered.api.text.action.HoverAction;

2
src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
View File

@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.text.Text;
import org.spongepowered.api.text.Texts;
import org.spongepowered.api.util.command.CommandCallable;

2
src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java
View File

@ -3,7 +3,7 @@ package com.plotsquared.sponge.util;
import java.util.ArrayList;
import java.util.Locale;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.item.ItemTypes;
import org.spongepowered.api.item.inventory.Carrier;

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

@ -1,7 +1,7 @@
package com.plotsquared.sponge.util;
import org.spongepowered.api.entity.Entity;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.world.World;
import org.spongepowered.api.world.extent.Extent;

2
src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
View File

@ -3,7 +3,7 @@ package com.plotsquared.sponge.uuid;
import java.util.UUID;
import org.spongepowered.api.GameProfile;
import org.spongepowered.api.entity.player.Player;
import org.spongepowered.api.entity.living.player.Player;
import com.google.common.base.Charsets;
import com.intellectualcrafters.plot.object.OfflinePlotPlayer;