Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-29 04:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1171

Browse Source
This commit is contained in:
Sauilitired 2016-06-16 02:08:01 +02:00
parent ae5e15e434
commit 5b103d49c0
6 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Bukkit/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
View File

@ -172,7 +172,12 @@ public class BukkitPlayer extends PlotPlayer {
public void setFlight(boolean fly) { public void setFlight(boolean fly) {
this.player.setAllowFlight(fly); this.player.setAllowFlight(fly);
} }
@Override
public boolean getFlight() {
return player.getAllowFlight();
}
@Override @Override
public void playMusic(Location location, int id) { public void playMusic(Location location, int id) {
//noinspection deprecation //noinspection deprecation

7
Core/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java
View File

@ -112,7 +112,12 @@ public class ConsolePlayer extends PlotPlayer {
@Override @Override
public void setFlight(boolean fly) {} public void setFlight(boolean fly) {}
@Override
public boolean getFlight() {
return true;
}
@Override @Override
public void playMusic(Location location, int id) {} public void playMusic(Location location, int id) {}

2
Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java
View File

@ -324,6 +324,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
*/ */
public abstract void setFlight(boolean fly); public abstract void setFlight(boolean fly);
public abstract boolean getFlight();
/** /**
* Play music at a location for the player. * Play music at a location for the player.
* @param location where to play the music * @param location where to play the music

7
Core/src/main/java/com/intellectualcrafters/plot/util/ByteArrayUtilities.java
View File

@ -15,4 +15,11 @@ public class ByteArrayUtilities {
return (bytes[0]<<24)&0xff000000|(bytes[1]<<16)&0x00ff0000|(bytes[2]<<8)&0x0000ff00|(bytes[3])&0x000000ff; return (bytes[0]<<24)&0xff000000|(bytes[1]<<16)&0x00ff0000|(bytes[2]<<8)&0x0000ff00|(bytes[3])&0x000000ff;
} }
public static boolean bytesToBoolean(byte[] bytes) {
return bytes[0] == 1;
}
public static byte[] booleanToBytes(boolean b) {
return new byte[] {(byte)(b ? 1 : 0)};
}
} }

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

@ -11,16 +11,7 @@ import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotArea; import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.util.AbstractTitle; import com.intellectualcrafters.plot.util.*;
import com.intellectualcrafters.plot.util.CommentManager;
import com.intellectualcrafters.plot.util.EventUtil;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.PlotGameMode;
import com.intellectualcrafters.plot.util.PlotWeather;
import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.intellectualcrafters.plot.util.expiry.ExpireManager; import com.intellectualcrafters.plot.util.expiry.ExpireManager;
import java.util.HashMap; import java.util.HashMap;
@ -94,7 +85,10 @@ public class PlotListener {
} }
Optional<Boolean> flyFlag = plot.getFlag(Flags.FLY); Optional<Boolean> flyFlag = plot.getFlag(Flags.FLY);
if (flyFlag.isPresent()) { if (flyFlag.isPresent()) {
player.setFlight(flyFlag.get()); if (flyFlag.get() != player.getFlight()) {
player.setPersistentMeta("flight", ByteArrayUtilities.booleanToBytes(player.getFlight()));
player.setFlight(flyFlag.get());
}
} }
Optional<Long> timeFlag = plot.getFlag(Flags.TIME); Optional<Long> timeFlag = plot.getFlag(Flags.TIME);
if (timeFlag.isPresent()) { if (timeFlag.isPresent()) {
@ -204,9 +198,13 @@ public class PlotListener {
} }
} }
if (plot.getFlag(Flags.FLY).isPresent()) { if (plot.getFlag(Flags.FLY).isPresent()) {
PlotGameMode gamemode = player.getGameMode(); if (player.hasPersistentMeta("flight")) {
if (gamemode == PlotGameMode.SURVIVAL || (gamemode == PlotGameMode.ADVENTURE)) { player.setFlight(ByteArrayUtilities.bytesToBoolean(player.getPersistentMeta("flight")));
player.setFlight(false); } else {
PlotGameMode gameMode = player.getGameMode();
if (gameMode == PlotGameMode.SURVIVAL || gameMode == PlotGameMode.ADVENTURE) {
player.setFlight(false);
}
} }
} }
if (plot.getFlag(Flags.TIME).isPresent()) { if (plot.getFlag(Flags.TIME).isPresent()) {

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

@ -167,7 +167,13 @@ public class SpongePlayer extends PlotPlayer {
this.player.offer(Keys.IS_FLYING, fly); this.player.offer(Keys.IS_FLYING, fly);
this.player.offer(Keys.CAN_FLY, fly); this.player.offer(Keys.CAN_FLY, fly);
} }
@Override
public boolean getFlight() {
Optional<Boolean> flying = player.get(Keys.CAN_FLY);
return flying.isPresent() && flying.get();
}
@Override @Override
public void playMusic(Location location, int id) { public void playMusic(Location location, int id) {
switch (id) { switch (id) {