EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix #1281 , Fix #1282 , and Sponge gradle

Browse Source
This commit is contained in:
MattBDev 2016-07-29 12:31:45 -04:00
parent 1f341e6ba9
commit 610e204d12
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1850,6 +1850,9 @@ public class PlayerEvents extends PlotListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onLeave(PlayerQuitEvent event) { public void onLeave(PlayerQuitEvent event) {
if (TaskManager.TELEPORT_QUEUE.contains(event.getPlayer().getName())) {
TaskManager.TELEPORT_QUEUE.remove(event.getPlayer().getName());
}
PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer()); PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
pp.unregister(); pp.unregister();
} }

3
Core/src/main/java/com/plotsquared/listener/PlotListener.java
View File

@ -207,7 +207,8 @@ public class PlotListener {
for (UUID uuid : plot.getOwners()) { for (UUID uuid : plot.getOwners()) {
PlotPlayer owner = UUIDHandler.getPlayer(uuid); PlotPlayer owner = UUIDHandler.getPlayer(uuid);
if ((owner != null) && !owner.getUUID().equals(player.getUUID())) { if ((owner != null) && !owner.getUUID().equals(player.getUUID())) {
MainUtil.sendMessage(player, C.NOTIFY_LEAVE.s().replace("%player", player.getName()).replace("%plot", plot.getId().toString())); MainUtil.sendMessage(owner, C.NOTIFY_LEAVE.s().replace("%player", player.getName()).replace("%plot", plot.getId()
.toString()));
} }
} }
} }

4
Sponge/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
} }
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecrell.vanilla.server.library'
dependencies { dependencies {
compile project(':Core') compile project(':Core')
@ -41,7 +41,7 @@ repositories {
} }
} }
minecraft { minecraft {
version = "2014" version = "1.10.2"
mappings = "snapshot_20160629" mappings = "snapshot_20160629"
runDir = 'run' runDir = 'run'
} }

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

@ -68,6 +68,14 @@ import org.spongepowered.api.world.gen.GenerationPopulator;
import org.spongepowered.api.world.gen.WorldGenerator; import org.spongepowered.api.world.gen.WorldGenerator;
import org.spongepowered.api.world.gen.WorldGeneratorModifier; import org.spongepowered.api.world.gen.WorldGeneratorModifier;
import java.io.File;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@Plugin(id = "plotsquared", name = "PlotSquared", description = "Easy, yet powerful Plot World generation and management.", @Plugin(id = "plotsquared", name = "PlotSquared", description = "Easy, yet powerful Plot World generation and management.",
url = "https://github.com/IntellectualSites/PlotSquared", version = "3.5.0-SNAPSHOT") url = "https://github.com/IntellectualSites/PlotSquared", version = "3.5.0-SNAPSHOT")
public class SpongeMain implements IPlotMain { public class SpongeMain implements IPlotMain {

2
build.gradle
View File

@ -18,7 +18,7 @@ ext {
git = Grgit.open() git = Grgit.open()
revision = "${git.head().abbreviatedId}" revision = "${git.head().abbreviatedId}"
} }
version = "3.4.5-SNAPSHOT${revision}" version = "3.4.5-SNAPSHOT-${revision}"
description = """PlotSquared""" description = """PlotSquared"""
subprojects { subprojects {