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

Fix invalid record type error

Browse Source
This commit is contained in:
MattBDev 2016-06-13 15:05:38 -04:00
parent 341967cbfc
commit ae5e15e434
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.BukkitUtil;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.WeatherType; import org.bukkit.WeatherType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -176,7 +175,8 @@ public class BukkitPlayer extends PlotPlayer {
@Override @Override
public void playMusic(Location location, int id) { public void playMusic(Location location, int id) {
this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.getMaterial(id)); //noinspection deprecation
this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id);
} }
@Override @Override

11
Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
View File

@ -21,19 +21,20 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
* Flag Manager Utility * Flag Manager Utility.
*
*/ */
public class FlagManager { public class FlagManager {
/** /**
* Some events can be called millions of times each second (e.g. physics) and reusing is a lot faster. * Some events can be called millions of times each second (e.g. physics)
* and reusing is a lot faster.
*/ */
private static final Optional MUTABLE_OPTIONAL; private static final Optional MUTABLE_OPTIONAL;
private static Field MUTABLE_OPTIONAL_FIELD; private static Field MUTABLE_OPTIONAL_FIELD;
static { static {
MUTABLE_OPTIONAL = Optional.of(new Object()); MUTABLE_OPTIONAL = Optional.of(new Object());
try { try {
MUTABLE_OPTIONAL_FIELD = MUTABLE_OPTIONAL.getClass().getDeclaredField("reference"); MUTABLE_OPTIONAL_FIELD = MUTABLE_OPTIONAL.getClass().getDeclaredField("reference");
MUTABLE_OPTIONAL_FIELD.setAccessible(true); MUTABLE_OPTIONAL_FIELD.setAccessible(true);
@ -115,7 +116,7 @@ public class FlagManager {
if (i != 0) { if (i != 0) {
flag_string.append(','); flag_string.append(',');
} }
flag_string.append(flag.getName() + ':' + flag.valueToString(entry.getValue()).replaceAll(":", "¯").replaceAll(",", "´")); flag_string.append(flag.getName() + ':' + flag.valueToString(entry.getValue()).replaceAll(":", "¯").replaceAll(",", "´"));
i++; i++;
} }
return flag_string.toString(); return flag_string.toString();