Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 05:05:16 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup warnings

Browse Source
This commit is contained in:
Mike Primm 2012-07-21 00:35:41 -05:00
parent 2a056033b8
commit 133d3078d7
6 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/dynmap/bukkit/BukkitWorld.java
View File

@ -15,7 +15,6 @@ import org.dynmap.utils.MapChunkCache;
public class BukkitWorld extends DynmapWorld {
private World world;
private Permission perm;
private World.Environment env;
private boolean skylight;
@ -24,7 +23,7 @@ public class BukkitWorld extends DynmapWorld {
world = w;
env = world.getEnvironment();
skylight = (env == World.Environment.NORMAL);
perm = new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
}
/* Test if world is nether */
@Override

30
src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -80,7 +80,6 @@ import org.dynmap.common.DynmapServerInterface;
import org.dynmap.common.DynmapListenerManager.EventType;
import org.dynmap.markers.MarkerAPI;
import org.dynmap.utils.MapChunkCache;
import org.getspout.spoutapi.plugin.SpoutPlugin;
public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private DynmapCore core;
@ -177,7 +176,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break;
case WORLD_SPAWN_CHANGE:
pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onSpawnChange(SpawnChangeEvent evt) {
DynmapWorld w = new BukkitWorld(evt.getWorld());
@ -191,7 +189,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break;
case PLAYER_BED_LEAVE:
pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onPlayerBedLeave(PlayerBedLeaveEvent evt) {
DynmapPlayer p = new BukkitPlayer(evt.getPlayer());
@ -201,7 +198,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break;
case PLAYER_CHAT:
pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onPlayerChat(PlayerChatEvent evt) {
if(evt.isCancelled()) return;
@ -214,7 +210,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break;
case BLOCK_BREAK:
pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockBreak(BlockBreakEvent evt) {
if(evt.isCancelled()) return;
@ -228,7 +223,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break;
case SIGN_CHANGE:
pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onSignChange(SignChangeEvent evt) {
if(evt.isCancelled()) return;
@ -732,13 +726,11 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private void registerPlayerLoginListener() {
Listener pl = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent evt) {
DynmapPlayer dp = new BukkitPlayer(evt.getPlayer());
core.listenerManager.processPlayerEvent(EventType.PLAYER_JOIN, dp);
}
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onPlayerQuit(PlayerQuitEvent evt) {
DynmapPlayer dp = new BukkitPlayer(evt.getPlayer());
@ -827,7 +819,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onplace) {
Listener placelistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockPlace(BlockPlaceEvent event) {
if(event.isCancelled())
@ -843,7 +834,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onbreak) {
Listener breaklistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockBreak(BlockBreakEvent event) {
if(event.isCancelled())
@ -861,7 +851,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onleaves) {
Listener leaveslistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onLeavesDecay(LeavesDecayEvent event) {
if(event.isCancelled())
@ -879,7 +868,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onburn) {
Listener burnlistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockBurn(BlockBurnEvent event) {
if(event.isCancelled())
@ -897,7 +885,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onblockphysics) {
Listener physlistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockPhysics(BlockPhysicsEvent event) {
if(event.isCancelled())
@ -914,6 +901,8 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
case SAND:
checkBlock(b, "blockphysics");
break;
default:
break;
}
}
};
@ -922,7 +911,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onblockfromto) {
Listener fromtolistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockFromTo(BlockFromToEvent event) {
if(event.isCancelled())
@ -942,7 +930,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onpiston) {
Listener pistonlistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockPistonRetract(BlockPistonRetractEvent event) {
if(event.isCancelled())
@ -969,7 +956,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
}
}
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockPistonExtend(BlockPistonExtendEvent event) {
if(event.isCancelled())
@ -1001,7 +987,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onblockspread) {
Listener spreadlistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockSpread(BlockSpreadEvent event) {
if(event.isCancelled())
@ -1017,7 +1002,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onblockform) {
Listener formlistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockForm(BlockFormEvent event) {
if(event.isCancelled())
@ -1033,7 +1017,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onblockfade) {
Listener fadelistener = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockFade(BlockFadeEvent event) {
if(event.isCancelled())
@ -1053,7 +1036,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
try {
Class.forName("org.bukkit.event.block.BlockGrowEvent");
Listener growTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockGrow(BlockGrowEvent event) {
if(event.isCancelled())
@ -1072,7 +1054,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onblockredstone) {
Listener redstoneTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onBlockRedstone(BlockRedstoneEvent event) {
Location loc = event.getBlock().getLocation();
@ -1086,7 +1067,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
/* Register player event trigger handlers */
Listener playerTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent event) {
if(onplayerjoin) {
@ -1102,7 +1082,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onplayermove) {
Listener playermove = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onPlayerMove(PlayerMoveEvent event) {
Location loc = event.getPlayer().getLocation();
@ -1114,7 +1093,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
}
/* Register entity event triggers */
Listener entityTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onEntityExplode(EntityExplodeEvent event) {
Location loc = event.getLocation();
@ -1148,7 +1126,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
/* Register world event triggers */
Listener worldTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onWorldLoad(WorldLoadEvent event) {
core.updateConfigHashcode();
@ -1156,7 +1133,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(core.processWorldLoad(w)) /* Have core process load first - fire event listeners if good load after */
core.listenerManager.processWorldEvent(EventType.WORLD_LOAD, w);
}
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onWorldUnload(WorldUnloadEvent event) {
core.updateConfigHashcode();
@ -1164,7 +1140,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(w != null)
core.listenerManager.processWorldEvent(EventType.WORLD_UNLOAD, w);
}
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onStructureGrow(StructureGrowEvent event) {
Location loc = event.getLocation();
@ -1199,7 +1174,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
ongeneratechunk = core.isTrigger("chunkgenerated");
if(ongeneratechunk) {
Listener chunkTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR)
public void onChunkPopulate(ChunkPopulateEvent event) {
Chunk c = event.getChunk();

5
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View File

@ -69,6 +69,7 @@ public class NewMapChunkCache implements MapChunkCache {
* Iterator for traversing map chunk cache (base is for non-snapshot)
*/
public class OurMapIterator implements MapIterator {
@SuppressWarnings("unused")
private int x, y, z, chunkindex, bx, bz, off;
private ChunkSnapshot snap;
private BlockStep laststep;
@ -601,9 +602,6 @@ public class NewMapChunkCache implements MapChunkCache {
public boolean isSectionEmpty(int sy) {
return (sy < 4);
}
public int getTopNonEmptySection() {
return 3;
}
}
private static class SpoutChunkSnapshot implements ChunkSnapshot {
@ -960,7 +958,6 @@ public class NewMapChunkCache implements MapChunkCache {
}
private void initSectionData(int idx) {
isSectionNotEmpty[idx] = new boolean[nsect + 1];
int maxy = 0;
if(snaparray[idx] != EMPTY) {
if(!use_sections) {
Arrays.fill(isSectionNotEmpty[idx], true);

1
src/main/java/org/dynmap/bukkit/SpoutPluginBlocks.java
View File

@ -9,7 +9,6 @@ import java.lang.reflect.Field;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import javax.imageio.ImageIO;

10
src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java
View File

@ -1,23 +1,13 @@
package org.dynmap.bukkit.permissions;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.dynmap.Log;
import com.nijiko.permissions.PermissionHandler;
import com.platymuus.bukkit.permissions.PermissionInfo;
import com.platymuus.bukkit.permissions.PermissionsPlugin;
import de.bananaco.bpermissions.api.ApiLayer;
import de.bananaco.bpermissions.api.util.CalculableType;
import de.bananaco.bpermissions.api.util.Permission;
public class PermBukkitPermissions extends BukkitPermissions {
PermissionsPlugin plugin;
Map<String, Boolean> pd;

9
src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java
View File

@ -4,21 +4,12 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.Plugin;
import org.dynmap.Log;
import ru.tehkode.permissions.bukkit.PermissionsEx;
import de.bananaco.bpermissions.api.ApiLayer;
import de.bananaco.bpermissions.api.User;
import de.bananaco.bpermissions.api.WorldManager;
import de.bananaco.bpermissions.api.util.CalculableType;
import de.bananaco.bpermissions.api.util.Permission;
public class bPermPermissions extends BukkitPermissions {
WorldManager wm;