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

Merge branch 'dev' into master

Browse Source
This commit is contained in:
Kamron Vaswani authored and GitHub committed 2021-12-21 23:50:51 -05:00
2 parents ff810cbc8d e8dd3e7ddc
commit b62149d5f6
5 files changed
+3 -89
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/CustomNpcs.java
+1 -1
View File
@@ -61,7 +61,7 @@ import noppes.npcs.entity.old.EntityNpcNagaMale;
import noppes.npcs.entity.old.EntityNpcSkeleton;
import noppes.npcs.scripted.wrapper.WrapperNpcAPI;
@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.3")
@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.3.2")
public class CustomNpcs {
@ConfigProp(info = "Disable Chat Bubbles")
src/main/java/noppes/npcs/blocks/BlockPedestal.java
+2 -1
View File
@@ -8,6 +8,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.tileentity.TileEntity;
@@ -41,7 +42,7 @@ public class BlockPedestal extends BlockTrigger{
par1World.markBlockForUpdate(i, j, k);
updateSurrounding(par1World, i, j, k);
}
else if(item == null || item.getItem() == null || !(item.getItem() instanceof ItemSword))
else if(item == null || item.getItem() == null || item.getItem() instanceof ItemBlock)
return true;
else if(item != null && weapon == null){
tile.setInventorySlotContents(0, item);