TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/breaking' into breaking

Browse source
This commit is contained in:
matt 2019-02-13 12:05:42 -05:00
commit 11c4a90cc9
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
View file

@ -375,7 +375,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
case FIREBALL:
case DRAGON_FIREBALL:
case DROPPED_ITEM:
if (Settings.Enabled_Components.KILL_ROAD_ITEMS || plotArea
if (Settings.Enabled_Components.KILL_ROAD_ITEMS && plotArea
.getOwnedPlotAbs(
BukkitUtil.getLocation(entity.getLocation())) == null) {
entity.remove();
@ -386,7 +386,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
case FALLING_BLOCK:
// managed elsewhere
continue;
case SHULKER: {
case SHULKER:
if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
LivingEntity livingEntity = (LivingEntity) entity;
List<MetadataValue> meta = entity.getMetadata("plot");
@ -436,7 +436,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
}
}
continue;
}
case LLAMA:
case DONKEY:
case MULE:

12
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View file

@ -1876,10 +1876,14 @@ import java.util.regex.Pattern;
eventType = PlayerBlockEventType.TELEPORT_OBJECT;
break;
default:
int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
.fromStringToLegacy(blockType.name())).id;
if (blockId > 197) {
eventType = PlayerBlockEventType.INTERACT_BLOCK;
LegacyPlotBlock legacyPlotBlock =
(LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
.fromStringToLegacy(blockType.name());
if (legacyPlotBlock != null) {
int blockId = legacyPlotBlock.id;
if (blockId > 197) {
eventType = PlayerBlockEventType.INTERACT_BLOCK;
}
}
break;
}

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
View file

@ -351,7 +351,7 @@ import java.util.concurrent.atomic.AtomicInteger;
task.set(statement);
task.addBatch(statement);
try {
if (statement.isClosed()) {
if (statement != null && statement.isClosed()) {
statement = null;
}
} catch (AbstractMethodError ignore) {