Fixed merge issues.

This commit is contained in:
Cekis
2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
+32 -32
View File
@@ -1,32 +1,32 @@
package script.space.characters;
import script.*;
import script.base_class.*;
import script.combat_engine.*;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import script.base_script;
import script.library.chat;
public class holfheim extends script.base_script
{
public holfheim()
{
}
public int OnAttach(obj_id self) throws InterruptedException
{
setAnimationMood(self, "npc_imperial");
setInvulnerable(self, true);
setName(self, "Under Inquisitor Holfheim");
return SCRIPT_CONTINUE;
}
public int OnInitialize(obj_id self) throws InterruptedException
{
setAnimationMood(self, "npc_imperial");
setInvulnerable(self, true);
setName(self, "Under Inquisitor Holfheim");
return SCRIPT_CONTINUE;
}
}
package script.space.characters;
import script.*;
import script.base_class.*;
import script.combat_engine.*;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import script.base_script;
import script.library.chat;
public class holfheim extends script.base_script
{
public holfheim()
{
}
public int OnAttach(obj_id self) throws InterruptedException
{
setAnimationMood(self, "npc_imperial");
setInvulnerable(self, true);
setName(self, "Under Inquisitor Holfheim");
return SCRIPT_CONTINUE;
}
public int OnInitialize(obj_id self) throws InterruptedException
{
setAnimationMood(self, "npc_imperial");
setInvulnerable(self, true);
setName(self, "Under Inquisitor Holfheim");
return SCRIPT_CONTINUE;
}
}