upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-14 06:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta 5 Gradle

Browse Source
This commit is contained in:
Kam committed 2024-02-28 20:58:00 -05:00
1 parent df88e5b4f9
commit 27359a429d
5 files changed
+34 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/ScriptItemEventHandler.java
+31 -23
View File
@@ -124,30 +124,38 @@ public class ScriptItemEventHandler {
if(event.entityPlayer.worldObj.isRemote && event.entityPlayer.worldObj instanceof WorldServer)
return;
if(event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR){
PlayerDataScript handler = PlayerDataController.Instance.getPlayerData(event.entityPlayer).scriptData;
if(handler.hadInteract) {
handler.hadInteract = false;
return;
if (PlayerDataController.Instance != null) {
if(event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR){
PlayerData handler = PlayerDataController.Instance.getPlayerData(event.entityPlayer);
if(handler == null)
return;
if(handler.hadInteract) {
handler.hadInteract = false;
return;
}
try {
if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 0, null);
event.setCanceled(EventHooks.onScriptItemRightClick(isw, eve));
}
} catch(Exception e) {}
}
else if(event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK){
PlayerData handler = PlayerDataController.Instance.getPlayerData(event.entityPlayer);
if(handler == null)
return;
handler.hadInteract = true;
try {
if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 2, NpcAPI.Instance().getIBlock((IWorld) NpcAPI.Instance().getIWorld(event.world), event.x, event.y, event.z));
event.setCanceled(EventHooks.onScriptItemRightClick(isw, eve));
}
} catch(Exception e) {}
}
try {
if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 0, null);
event.setCanceled(EventHooks.onScriptItemRightClick(isw, eve));
}
} catch(Exception e) {}
}
else if(event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK){
PlayerDataScript handler = PlayerDataController.Instance.getPlayerData(event.entityPlayer).scriptData;
handler.hadInteract = true;
try {
if (event.entityPlayer.getHeldItem().getItem() == CustomItems.scripted_item && !event.isCanceled()) {
IItemCustom isw = ItemScripted.GetWrapper(event.entityPlayer.getHeldItem());
ItemEvent.RightClickEvent eve = new ItemEvent.RightClickEvent(isw, (IPlayer) NpcAPI.Instance().getIEntity(event.entityPlayer), 2, NpcAPI.Instance().getIBlock((IWorld) NpcAPI.Instance().getIWorld(event.world), event.x, event.y, event.z));
event.setCanceled(EventHooks.onScriptItemRightClick(isw, eve));
}
} catch(Exception e) {}
}
}
src/main/java/noppes/npcs/controllers/PlayerDataController.java
-3
View File
@@ -291,7 +291,6 @@ public class PlayerDataController {
if(data != null){
if(data.player == null){
data.player = player;
data.scriptData = new PlayerDataScript(player);
}
return data;
}
@@ -300,13 +299,11 @@ public class PlayerDataController {
if(data == null){
player.registerExtendedProperties("CustomNpcsData", data = new PlayerData());
data.player = player;
data.scriptData = new PlayerDataScript(player);
data.load();
}
if(data.player == null){
data.player = player;
data.scriptData = new PlayerDataScript(player);
}
return data;
}
src/main/java/noppes/npcs/controllers/data/PlayerData.java
+2 -2
View File
@@ -41,7 +41,6 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
public PlayerItemGiverData itemgiverData = new PlayerItemGiverData(this);
public PlayerMailData mailData = new PlayerMailData(this);
public AnimationData animationData = new AnimationData(this);
public PlayerDataScript scriptData;
public DataTimers timers = new DataTimers(this);
public DataSkinOverlays skinOverlays = new DataSkinOverlays(this);
@@ -61,8 +60,9 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
public int companionID = 0;
public boolean isGUIOpen = false;
public boolean hadInteract = true;
public ScreenSize screenSize = new ScreenSize(-1,-1);
public ScreenSize screenSize = new ScreenSize(-1,-1);
public void onLogin() {
src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java
-1
View File
@@ -26,7 +26,6 @@ public class PlayerDataScript implements INpcScriptHandler {
private IPlayer playerAPI;
private long lastPlayerUpdate = 0L;
public long lastInited = -1L;
public boolean hadInteract = true;
public boolean enabled = false;
public PlayerDataScript(EntityPlayer player) {