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

Minor:

Browse Source 
Fix BukkitLegacyMappings method map usage
Move obtaining legacy block to default clause
Task should be async
This commit is contained in:
dordsor21 2019-01-12 18:05:20 +00:00
parent 8ba661aa35
commit f62777bc1a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -1723,8 +1723,6 @@ import java.util.regex.Pattern;
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
location = BukkitUtil.getLocation(block.getLocation()); location = BukkitUtil.getLocation(block.getLocation());
Material blockType = block.getType(); Material blockType = block.getType();
int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
.fromStringToLegacy(blockType.name())).id;
switch (blockType) { switch (blockType) {
case ANVIL: case ANVIL:
case ACACIA_DOOR: case ACACIA_DOOR:
@ -1849,6 +1847,8 @@ import java.util.regex.Pattern;
eventType = PlayerBlockEventType.TELEPORT_OBJECT; eventType = PlayerBlockEventType.TELEPORT_OBJECT;
break; break;
default: default:
int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
.fromStringToLegacy(blockType.name())).id;
if (blockId > 197) { if (blockId > 197) {
eventType = PlayerBlockEventType.INTERACT_BLOCK; eventType = PlayerBlockEventType.INTERACT_BLOCK;
} }

4
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
View File

@ -776,11 +776,11 @@ public final class BukkitLegacyMappings extends LegacyMappings {
} }
public PlotBlock fromLegacyToString(final String id) { public PlotBlock fromLegacyToString(final String id) {
return NEW_STRING_TO_LEGACY_PLOT_BLOCK.get(id); return OLD_STRING_TO_STRING_PLOT_BLOCK.get(id);
} }
public PlotBlock fromStringToLegacy(final String id) { public PlotBlock fromStringToLegacy(final String id) {
return OLD_STRING_TO_STRING_PLOT_BLOCK.get(id.toLowerCase(Locale.ENGLISH)); return NEW_STRING_TO_LEGACY_PLOT_BLOCK.get(id.toLowerCase(Locale.ENGLISH));
} }
@Getter @EqualsAndHashCode @ToString @RequiredArgsConstructor @Getter @EqualsAndHashCode @ToString @RequiredArgsConstructor

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
View File

@ -32,7 +32,7 @@ public abstract class TaskManager {
if (IMP == null) { if (IMP == null) {
throw new IllegalArgumentException("disabled"); throw new IllegalArgumentException("disabled");
} }
return IMP.taskRepeat(runnable, interval); return IMP.taskRepeatAsync(runnable, interval);
} }
return -1; return -1;
} }