mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 00:35:06 +00:00
RightClick Event for Scripted Items
This commit is contained in:
1 parent
4a58702d16
commit
7f2a375323
9 files changed
+101
-14
No files matched your search
@@ -12,10 +12,7 @@ import net.minecraft.util.ChatComponentText;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.LogWriter;
|
||||
import noppes.npcs.config.ConfigMain;
|
||||
import noppes.npcs.controllers.data.Bank;
|
||||
import noppes.npcs.controllers.data.PlayerBankData;
|
||||
import noppes.npcs.controllers.data.PlayerData;
|
||||
import noppes.npcs.controllers.data.PlayerMail;
|
||||
import noppes.npcs.controllers.data.*;
|
||||
import noppes.npcs.util.CacheHashMap;
|
||||
import noppes.npcs.util.NBTJsonUtil;
|
||||
|
||||
@@ -292,7 +289,10 @@ public class PlayerDataController {
|
||||
public PlayerData getPlayerData(EntityPlayer player){
|
||||
PlayerData data = getPlayerDataCache(player.getUniqueID().toString());
|
||||
if(data != null){
|
||||
data.player = player;
|
||||
if(data.player == null){
|
||||
data.player = player;
|
||||
data.scriptData = new PlayerDataScript(player);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
@@ -300,9 +300,14 @@ public class PlayerDataController {
|
||||
if(data == null){
|
||||
player.registerExtendedProperties("CustomNpcsData", data = new PlayerData());
|
||||
data.player = player;
|
||||
data.scriptData = new PlayerDataScript(player);
|
||||
data.load();
|
||||
}
|
||||
data.player = player;
|
||||
|
||||
if(data.player == null){
|
||||
data.player = player;
|
||||
data.scriptData = new PlayerDataScript(player);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user