sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

improve overlay, fix spawner

Browse source
This commit is contained in:
Sen 2025-08-01 22:29:41 +02:00
parent 330ee75a27
commit 81355293e3
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
5 changed files with 50 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/common/entity/Entity.java
View file

@ -1368,12 +1368,12 @@ public abstract class Entity
}
}
public HitPosition rayTrace(double blockReachDistance, float partialTicks)
public HitPosition rayTrace(double blockReachDistance, float partialTicks, boolean liquid)
{
Vec3 vec3 = this.getPositionEyes(partialTicks);
Vec3 vec31 = this.getLook(partialTicks);
Vec3 vec32 = vec3.addVector(vec31.xCoord * blockReachDistance, vec31.yCoord * blockReachDistance, vec31.zCoord * blockReachDistance);
return this.worldObj.rayTraceBlocks(vec3, vec32, false, false, true);
return this.worldObj.rayTraceBlocks(vec3, vec32, liquid, false, true);
}
/**

2
common/src/main/java/common/entity/npc/EntityNPC.java
View file

@ -3391,6 +3391,8 @@ public abstract class EntityNPC extends EntityLiving implements IInventory
public void onDataWatcherUpdate(int data) {
if(this.isPlayer() && data == 11) // (data == 29 || data == 11)) // && this.worldObj.client)
this.updateSize();
else if(data == 8 && this.worldObj.client)
this.alignment = this.getAlignment();
}
private void updateSize() {

11
common/src/main/java/common/entity/types/EntityLiving.java
View file

@ -3008,7 +3008,7 @@ public abstract class EntityLiving extends Entity
if (itemstack != null && itemstack.getItem() instanceof ItemMobTemplate)
{
if (!this.worldObj.client)
if (!this.worldObj.client && player.connection.isAdmin())
{
// Class <? extends Entity > oclass = EntityRegistry.getClassFromName(((ItemMonsterPlacer)itemstack.getItem())
// .getSpawnedId());
@ -3028,15 +3028,6 @@ public abstract class EntityLiving extends Entity
{
child.setCustomNameTag(itemstack.getDisplayName());
}
// if (!player.creative)
// {
if (itemstack.decrSize())
{
player.setHeldItem(null);
}
// }
}
}
}