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

Merge branch 'patch' into dev

Browse Source 
# Conflicts:
#	src/main/java/noppes/npcs/client/fx/CustomFX.java
This commit is contained in:
Luis C.M committed 2023-06-01 18:15:54 -05:00
2 parents a21ce47a60 6febeeea02
commit b191ede19c
3 files changed
+13 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/PacketHandlerServer.java
+1 -2
View File
@@ -306,9 +306,8 @@ public class PacketHandlerServer{
NBTTagCompound compound = Server.readNBT(buffer);
ScriptCustomItem wrapper = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
wrapper.setMCNbt(compound);
wrapper.loadScriptData();
wrapper.loaded = false;
wrapper.saveScriptData();
wrapper.loaded = false;
player.sendContainerToPlayer(player.inventoryContainer);
}
}
src/main/java/noppes/npcs/mixin/MixinModelRenderer.java
+11 -5
View File
@@ -112,12 +112,18 @@ public abstract class MixinModelRenderer {
}
if (ClientEventHandler.renderingPlayer != null && Client.playerAnimations.containsKey(ClientEventHandler.renderingPlayer.getUniqueID())) {
animData = Client.playerAnimations.get(ClientEventHandler.renderingPlayer.getUniqueID());
EnumAnimationPart mainPartType = this.getPlayerPartType((ModelRenderer) (Object) this);
EnumAnimationPart pivotEqualPart = null;
if (mainPartType == null) {
pivotEqualPart = this.pivotEqualPart((ModelRenderer) (Object) this);
EnumAnimationPart mainPartType = null;
try{
EnumAnimationPart pivotEqualPart = null;
mainPartType = this.getPlayerPartType((ModelRenderer) (Object) this);
if (mainPartType == null) {
pivotEqualPart = this.pivotEqualPart((ModelRenderer) (Object) this);
}
partType = mainPartType != null ? mainPartType : pivotEqualPart;
}
partType = mainPartType != null ? mainPartType : pivotEqualPart;
catch (Exception ignored){}
if (partType != null && animData != null) {
if (!ClientEventHandler.originalValues.containsKey((ModelRenderer) (Object) this)) {
FramePart part = new FramePart();
src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java
+1 -1
View File
@@ -439,7 +439,7 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
public void loadItemData() {
NBTTagCompound c = this.item.getTagCompound();
if (c != null){
if (c != null && !c.getCompoundTag("ItemData").hasNoTags()){
this.setItemNBT(c.getCompoundTag("ItemData"));
}
}