Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-24 19:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Updated for dre

Browse Source 
Signed-off-by: Grafe <flingelfrank@hotmail.com>
This commit is contained in:
Grafe 2013-04-07 20:16:25 +02:00
parent 88c6b6d357
commit 5b81bfbeb5
4 changed files with 97 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/dre/dungeonsxl/DPlayer.java
View File

@ -466,9 +466,11 @@ public class DPlayer {
//Check Distance Trigger Signs //Check Distance Trigger Signs
for(DSign sign : gworld.dSigns){ for(DSign sign : gworld.dSigns){
if(sign.isDistanceTrigger()){ if(sign != null){
if(dplayer.player.getLocation().distance(sign.getSign().getLocation()) < sign.getDtDistance()){ if(sign.isDistanceTrigger()){
sign.onTrigger(); if(dplayer.player.getLocation().distance(sign.getSign().getLocation()) < sign.getDtDistance()){
sign.onTrigger();
}
} }
} }
} }

5
src/com/dre/dungeonsxl/P.java
View File

@ -37,6 +37,7 @@ import com.dre.dungeonsxl.listener.EntityListener;
import com.dre.dungeonsxl.listener.HangingListener; import com.dre.dungeonsxl.listener.HangingListener;
import com.dre.dungeonsxl.listener.PlayerListener; import com.dre.dungeonsxl.listener.PlayerListener;
import com.dre.dungeonsxl.listener.WorldListener; import com.dre.dungeonsxl.listener.WorldListener;
import com.dre.dungeonsxl.util.DUtility;
public class P extends JavaPlugin{ public class P extends JavaPlugin{
public static P p; public static P p;
@ -63,7 +64,9 @@ public class P extends JavaPlugin{
@Override @Override
public void onEnable(){ public void onEnable(){
p = this; p = this;
DUtility.convertOldSigns();
//Commands //Commands
getCommand("dungeonsxl").setExecutor(new CommandListener()); getCommand("dungeonsxl").setExecutor(new CommandListener());

6
src/com/dre/dungeonsxl/game/GameWorld.java
View File

@ -84,8 +84,10 @@ public class GameWorld {
this.isPlaying=true; this.isPlaying=true;
for(DSign dSign : this.dSigns){ for(DSign dSign : this.dSigns){
if(!dSign.isOnDungeonInit()){ if(dSign != null){
dSign.onInit(); if(!dSign.isOnDungeonInit()){
dSign.onInit();
}
} }
} }
} }

84
src/com/dre/dungeonsxl/util/DUtility.java Normal file
View File

@ -0,0 +1,84 @@
package com.dre.dungeonsxl.util;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.ObjectInputStream;
import org.bukkit.World;
import org.bukkit.WorldCreator;
import org.bukkit.block.Block;
import org.bukkit.block.Sign;
import com.dre.dungeonsxl.P;
public class DUtility {
public static P p = P.p;
public static void convertOldSigns(){
File file=new File(p.getDataFolder(),"/dungeons/");
if(file.exists()){
for(File dungeonFolder : file.listFiles()){
if(dungeonFolder.isDirectory()){
p.copyDirectory(dungeonFolder, new File("DXL_TMP"));
World world = p.getServer().createWorld(WorldCreator.name("DXL_TMP"));
//World
try {
ObjectInputStream os=new ObjectInputStream(new FileInputStream(new File(p.getDataFolder(),"/dungeons/"+dungeonFolder.getName()+"/DXLData.data")));
int length=os.readInt();
for(int i=0; i<length; i++){
int x=os.readInt();
int y=os.readInt();
int z=os.readInt();
Block block = world.getBlockAt(x, y, z);
if(block.getState() instanceof Sign){
Sign sign = (Sign) block.getState();
if(sign.getLine(0).equalsIgnoreCase("[dxl]")){
sign.setLine(0, "["+sign.getLine(1)+"]");
sign.setLine(1, sign.getLine(2));
sign.setLine(2, sign.getLine(3));
sign.update();
if(sign.getLine(0).equalsIgnoreCase("[mob]")){
String[] splitted = sign.getLine(2).split(",");
if(splitted.length >= 3){
sign.setLine(2, splitted[0] + "," + splitted[1]);
sign.setLine(3, "D "+splitted[2]);
}
}
if(sign.getLine(0).equalsIgnoreCase("[msg]") || sign.getLine(0).equalsIgnoreCase("[soundmsg]")){
sign.setLine(3, "D "+sign.getLine(2));
sign.setLine(2, "");
}
if(sign.getLine(0).equalsIgnoreCase("[checkpoint]")){
sign.setLine(3, "D "+sign.getLine(1));
sign.setLine(1, "");
}
sign.update();
}
}
}
os.close();
p.getServer().unloadWorld(world, true);
p.copyDirectory(new File("DXL_TMP"), dungeonFolder);
p.removeDirectory(new File("DXL_TMP"));
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
}
}