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

Merge pull request #283 from zeng-github01: disable auto-open GUI for BlockBorder and BlockNpcRedstone

Browse Source
This commit is contained in:
KAMKEEL committed 2026-08-11 05:22:36 -04:00
2 parents a71532f49a b8d68f771f
commit caa39d6d5d
3 files changed
+4 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/blocks/BlockBorder.java
-4
View File
@@ -67,10 +67,6 @@ public class BlockBorder extends BlockContainer {
}
tile.rotation = l;
if (par5EntityLivingBase instanceof EntityPlayer && par1World.isRemote) {
CustomNpcs.proxy.openGui(x, y, z, EnumGuiType.Border, (EntityPlayer) par5EntityLivingBase);
}
}
private TileBorder getTile(World world, int x, int y, int z) {
src/main/java/noppes/npcs/blocks/BlockNpcRedstone.java
-7
View File
@@ -49,13 +49,6 @@ public class BlockNpcRedstone extends BlockContainer {
par1World.notifyBlocksOfNeighborChange(par2, par3, par4 + 1, this);
}
@Override
public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack item) {
if (entityliving instanceof EntityPlayer && world.isRemote) {
CustomNpcs.proxy.openGui(i, j, k, EnumGuiType.RedstoneBlock, (EntityPlayer) entityliving);
}
}
@Override
public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {
onBlockAdded(par1World, par2, par3, par4);
src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java
+4 -4
View File
@@ -112,19 +112,19 @@ public class SubGuiNpcAvailabilityDialog extends SubGuiInterface implements GuiS
}
if (button.id == 10) {
slot = 1;
setSubGui(new GuiDialogSelection(availabitily.questId));
setSubGui(new GuiDialogSelection(availabitily.dialogId));
}
if (button.id == 11) {
slot = 2;
setSubGui(new GuiDialogSelection(availabitily.quest2Id));
setSubGui(new GuiDialogSelection(availabitily.dialog2Id));
}
if (button.id == 12) {
slot = 3;
setSubGui(new GuiDialogSelection(availabitily.quest3Id));
setSubGui(new GuiDialogSelection(availabitily.dialog3Id));
}
if (button.id == 13) {
slot = 4;
setSubGui(new GuiDialogSelection(availabitily.quest4Id));
setSubGui(new GuiDialogSelection(availabitily.dialog4Id));
}
if (button.id == 20) {
availabitily.dialogId = -1;