Skip to content

Fix some conflicts with other plugins using map files #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eccentricdevotion wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix some conflicts with other plugins using map files #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c01a81d
Don't rename the map if the album name returns an empty string
eccentricdevotion Oct 2, 2014
d74425c
Add a config list option to reserve map ids
eccentricdevotion Oct 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/fromgate/obscura/COAlbum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ public short createMap (BufferedImage image, boolean reusedeleted, String name,
if ((!reusedeleted)||deletedmaps.isEmpty()||(deletedmaps.size()==0)) return createNewMap (image);
short id = deletedmaps.get(0);
deletedmaps.remove(0);
return updateMap (id, image);
// don't use reserved map ids - servers can set map ids in the config
if (plg.reserved_maps.contains(id)) return createNewMap(image);
return updateMap (id, image);
}

public boolean isObscuraMap (short id){
Expand Down
2 changes: 2 additions & 0 deletions src/fromgate/obscura/COCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ public static void updateMapName (ItemStack item){
if ((item==null)||(item.getType()!=Material.MAP)) return;
short id = item.getDurability();
String name_album = plg().album.getPictureName(id);
// don't rename the item as the map may be used by another plugin
if (name_album.isEmpty()) return;
String name_item = getName (item);
if (!name_album.equals(name_item)) setName (item, name_album);
}
Expand Down
4 changes: 4 additions & 0 deletions src/fromgate/obscura/Obscura.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import net.milkbowl.vault.economy.Economy;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
Expand Down Expand Up @@ -137,6 +139,7 @@ public class Obscura extends JavaPlugin {
boolean stroke = true;
String name_color = "#000000";
String stroke_color = "#FFFFFF";
List<Short> reserved_maps = Arrays.asList((short)1963, (short)1964);;
int name_x = 1;
int name_y = 122;

Expand Down Expand Up @@ -262,6 +265,7 @@ public void loadCfg(){
name_color = getConfig().getString("picture-name.font-color","#000000");
stroke =getConfig().getBoolean("picture-name.stroke",true);
stroke_color = getConfig().getString("picture-name.stroke-color","#FFFFFF");
reserved_maps = getConfig().getShortList("reserved-maps");
}

}