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

Optimizations and cleaning.

Browse Source 
Fixes #943 (even though it should be impossible)
This commit is contained in:
Matt
2016-03-08 21:18:54 -05:00
parent 286e5b8b97
commit 57fa265b48
10 changed files with 48 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sponge/build.gradle
View File

@ -16,7 +16,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
dependencies {
compile project(':Core')
compile 'org.spongepowered:spongeapi:3.1.0-SNAPSHOT'
compile 'org.spongepowered:spongeapi:4.0.3'
}
sourceCompatibility = 1.8
@ -69,4 +69,4 @@ task deobfJar(type: Jar) {
classifier = 'dev'
}
build.dependsOn(shadowJar)
build.dependsOn(shadowJar)

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

@ -94,7 +94,7 @@ public class MainListener {
@Listener
public void onChat(final MessageEvent event) {
// TODO
Player player = SpongeUtil.<Player> getCause(event.getCause(), Player.class);
Player player = SpongeUtil.getCause(event.getCause(), Player.class);
if (player == null) {
return;
}
@ -112,7 +112,7 @@ public class MainListener {
if (plot == null) {
return;
}
final Text message = event.getMessage().orElse(Text.EMPTY);
final Text message = event.getMessage();
// TODO use display name rather than username
// - Getting displayname currently causes NPE, so wait until sponge fixes that
@ -120,7 +120,7 @@ public class MainListener {
final String sender = player.getName();
final PlotId id = plot.getId();
final String newMessage = StringMan.replaceAll(C.PLOT_CHAT_FORMAT.s(), "%plot_id%", id.x + ";" + id.y, "%sender%", sender);
final Text forcedMessage = event.getMessage().orElse(Text.EMPTY);
final Text forcedMessage = event.getMessage();
// String forcedMessage = StringMan.replaceAll(C.PLOT_CHAT_FORCED.s(), "%plot_id%", id.x + ";" + id.y, "%sender%", sender);
for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
PlotPlayer user = entry.getValue();
@ -146,7 +146,7 @@ public class MainListener {
}
((SpongePlayer) user).player.sendMessage(Text.join(components));
}
event.setMessage(null);
event.clearMessage();
}
@Listener
@ -321,7 +321,7 @@ public class MainListener {
@Listener
public void onInteract(InteractEvent event) throws Exception {
final Player player = SpongeUtil.<Player> getCause(event.getCause(), Player.class);
final Player player = SpongeUtil.getCause(event.getCause(), Player.class);
if (player == null) {
event.setCancelled(true);
return;
@ -455,7 +455,7 @@ public class MainListener {
@Listener
public void onBlockBreak(final ChangeBlockEvent.Break event) {
Player player = SpongeUtil.<Player> getCause(event.getCause(), Player.class);
Player player = SpongeUtil.getCause(event.getCause(), Player.class);
if (player == null) {
// SpongeUtil.printCause("break", event.getCause());
return;
@ -539,7 +539,7 @@ public class MainListener {
@Listener
public void onBlockPlace(final ChangeBlockEvent.Place event) {
Player player = SpongeUtil.<Player> getCause(event.getCause(), Player.class);
Player player = SpongeUtil.getCause(event.getCause(), Player.class);
if (player == null) {
// SpongeUtil.printCause("place", event.getCause());
return;
@ -761,4 +761,4 @@ public class MainListener {
}
}
}
}
}