v3.4.3

- Fix bug where selecting floor for first time after elevator creation may throw NullPointerException
- Store elev id inside Elevator class to ensure deletion works correctly
- Commands ignoring case could cause issues with autocomplete

Author: Pecacheu

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.forestfire</groupId>
 	<artifactId>Elevators</artifactId>
-	<version>3.4.2</version>
+	<version>3.4.3</version>
 	<packaging>jar</packaging>
 	<name>Elevators</name>
 	<properties>
@@ -50,7 +50,7 @@
 	<repositories>
 		<repository>
 			<id>papermc</id>
-			<url>https://repo.papermc.io/repository/maven-public/</url>
+			<url>https://repo.papermc.io/repository/maven-public</url>
 		</repository>
 	</repositories>
 	<dependencies>

src/main/java/net/forestfire/elevators/Conf.java

@@ -202,7 +202,7 @@ static Object loadConf() { try {
 	//Load Compressed Elevator Data:
 	elevators.clear(); ConfigurationSection eList=conf.getConfigurationSection("elevators");
 	int eCnt=0; if(eList!=null) for(String k: eList.getKeys(false)) {
-		Elevator e=Elevator.fromSaveData(eList.getStringList(k));
+		Elevator e=Elevator.fromSaveData(k, eList.getStringList(k));
 		if(e!=null) elevators.put(k,e);
 		else { eCnt++; err("loadConfig", "fromSaveData returned null at ID "+k); }
 	}

src/main/java/net/forestfire/elevators/Elevator.java

@@ -17,6 +17,7 @@
 import org.bukkit.util.Vector;
 
 public class Elevator {
+public final String id;
 public Floor floor;
 public ChuList<ChuList<Block>> sGroups;
 public ChuList<ChuList<Block>> csGroups;
@@ -25,14 +26,14 @@ public class Elevator {
 
 //-- Initialization Functions
 
-public Elevator(Floor _floor, ChuList<ChuList<Block>> _sGroups, ChuList<ChuList<Block>> _csGroups) {
-	floor=_floor; if(_sGroups==null) sGroups=new ChuList<>(); else sGroups=_sGroups;
+public Elevator(String _id, Floor _floor, ChuList<ChuList<Block>> _sGroups, ChuList<ChuList<Block>> _csGroups) {
+	id=_id; floor=_floor; if(_sGroups==null) sGroups=new ChuList<>(); else sGroups=_sGroups;
 	if(_csGroups==null) csGroups=new ChuList<>(); else csGroups=_csGroups;
 	csData = new ChuList<>();
 }
 
 //Data Format: [World, Signs1 X, Signs1 Z, Signs2 X, Signs2 Z...]
-public static Elevator fromSaveData(java.util.List<String> data) {
+public static Elevator fromSaveData(String id, java.util.List<String> data) {
 	if(data.size() < 3 || data.size() % 2 == 0) { Conf.err("fromSaveData", "Data length too small or not odd number."); return null; }
 	World w=Bukkit.getServer().getWorld(data.getFirst()); if(w==null) {
 		Conf.err("fromSaveData", "World '"+data.getFirst()+"' does not exist!"); return null;
@@ -45,7 +46,7 @@ public static Elevator fromSaveData(java.util.List<String> data) {
 		if(sList.length!=0) sGroups.add(sList);
 	}
 	if(sGroups.length==0) { Conf.err("fromSaveData", "No elevator signs found!"); return null; }
-	Elevator elev = new Elevator(null, sGroups, null); Block dSign = sGroups.getFirst().getFirst();
+	Elevator elev = new Elevator(id, null, sGroups, null); Block dSign = sGroups.getFirst().getFirst();
 	Floor f=Floor.getFloor(w.getBlockAt(dSign.getX(), elev.getLevel(true)+2, dSign.getZ()), elev);
 	if(f==null) { Conf.err("fromSaveData", "No elevator floor detected!"); return null; }
 	elev.floor=f; elev.rebuildCallSignList(null);
@@ -65,9 +66,11 @@ public ChuList<String> toSaveData() {
 
 //The names Bond. James Bond
 public void selfDestruct() {
-	if(floor != null && sGroups.length>0 && sGroups.getFirst().length>0) { resetElevator(true); setDoors(0,false); }
-	floor=null; for(ChuList<Block> c: csGroups) for(Block s: c) s.setType(Conf.AIR);
-	Conf.elevators.entrySet().remove(this);
+	if(floor != null && sGroups.length>0 && sGroups.getFirst().length>0) {
+		resetElevator(); setDoors(0,false);
+	}
+	for(ChuList<Block> c: csGroups) for(Block s: c) s.setType(Conf.AIR);
+	floor=null; Conf.elevators.remove(id);
 }
 
 public int yMin() { return sGroups.getFirst().getFirst().getY()-2; }
@@ -235,7 +238,7 @@ public void updateFloorName(String flName) {
 public FList getFloors() {
 	ChuList<Block> ds=sGroups.getFirst(); int n=0;
 	String s,sel=Conf.rc(Conf.line(ds.getFirst(),1));
-	sel=sel.substring(Conf.L_STL, sel.length()-Conf.L_ENDL);
+	if(!sel.isEmpty()) sel=sel.substring(Conf.L_STL, sel.length()-Conf.L_ENDL);
 	int i=0,l=ds.length; ChuList<String> fn=new ChuList<>(l);
 	for(; i<l; i++) {
 		fn.add(s=Conf.line(ds.get(i),3));

src/main/java/net/forestfire/elevators/Floor.java

@@ -47,9 +47,9 @@ public static Floor getFloor(Block b, Elevator parent) {
 
 //Creates Floor or MovingFloor at height 'h'
 //If MovingFloor, returns new floorID
-//Deletes existing floor blocks unless 'dontDelete' is true
-public int addFloor(double h, boolean isMoving, boolean dontDelete, Integer forceID) {
-	if(!dontDelete) { removeFallingBlocks(); elev.resetElevator(true); }
+//Deletes existing floor blocks unless 'noDelete' is true
+public int addFloor(double h, boolean isMoving, boolean noDelete, Integer forceID) {
+	if(!noDelete) { removeFallingBlocks(); elev.resetElevator(true); }
 	if(isMoving) { //Create FallingBlock Floor
 		ChuList<FallingBlock> bl=new ChuList<>((xMax-xMin+1)*(zMax-zMin+1)); moving=true;
 		for(int x=xMin; x<=xMax; x++) for(int z=zMin; z<=zMax; z++) {
@@ -62,8 +62,8 @@ public int addFloor(double h, boolean isMoving, boolean dontDelete, Integer forc
 		for(int x=xMin; x<=xMax; x++) for(int z=zMin; z<=zMax; z++) world.getBlockAt(x,(int)h,z).setType(fType);
 	} return 0;
 }
-public int addFloor(double h, boolean isMoving, boolean dontDelete) {
-	return addFloor(h, isMoving, dontDelete, null);
+public int addFloor(double h, boolean isMoving, boolean noDelete) {
+	return addFloor(h, isMoving, noDelete, null);
 }
 
 //Moves a MovingFloor using floorID

src/main/java/net/forestfire/elevators/Main.java

@@ -48,7 +48,7 @@ public void onDisable() {
 }
 @Override
 public boolean onCommand(@NotNull CommandSender s, Command c, @NotNull String l, String[] a) {
-	if(c.getName().equalsIgnoreCase("elev")) {
+	if(c.getName().equals("elev")) {
 		if(a.length == 1 && a[0].equals("list")) {
 			Collection<Elevator> el = Conf.elevators.values();
 			Conf.msg(s, el.size()+" Elevators:");
@@ -150,7 +150,8 @@ private boolean checkLine(SignChangeEvent e, String test) {
 				Conf.err("onSignChange:ElevSign:NewElev", "Floor not found!"); return;
 			}
 			String eID=Conf.locToString(new Location(f.world, f.xMin, 0, f.zMin));
-			elev=new Elevator(f, null, null); Conf.elevators.put(eID, (f.elev=elev));
+			elev=new Elevator(eID, f, null, null);
+			Conf.elevators.put(eID, (f.elev=elev));
 			sList=Elevator.rebuildSignList(sign); Conf.msg(e.getPlayer(), "&eElevator created.");
 		}