fixes to the new paintbrush logic

fixed a related crash on entity destruction, and a conflict between sneaking and not.
EternalBlueFlame · Jan 5, 2024 · 7f4be14 · 7f4be14
1 parent c698890
commit 7f4be14
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/main/java/train/common/api/EntityRollingStock.java b/src/main/java/train/common/api/EntityRollingStock.java
@@ -382,12 +382,6 @@ public boolean attackEntityFrom(DamageSource damagesource, float i) {
         if (worldObj.isRemote || isDead) {
             return true;
         }
-        if(damagesource.getEntity() instanceof EntityPlayerMP){
-            if(((EntityPlayerMP) damagesource.getEntity()).getHeldItem().getItem() instanceof ItemPaintbrushThing){
-
-            }
-
-        }
         if (damagesource.getEntity() instanceof EntityPlayer && !damagesource.isProjectile()) {
             if (this instanceof IPassenger) {
                 if (canBeDestroyedByPlayer(damagesource)) return false;
@@ -1725,7 +1719,7 @@ public boolean interactFirst(EntityPlayer entityplayer) {
             return true;
         }
 
-        if (itemstack != null && itemstack.getItem() instanceof ItemPaintbrushThing) {
+        if (itemstack != null && itemstack.getItem() instanceof ItemPaintbrushThing && !entityplayer.isSneaking()) {
             if (this.getSpec().getLiveries().size() > 0) {
                 entityplayer.openGui(Traincraft.instance, GuiIDs.PAINTBRUSH, entityplayer.getEntityWorld(), this.getEntityId(), -1, (int) this.posZ);
             }