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

Merge pull request #221 from KAMKEEL/codex/fix-npc-size-collision-issues

Browse Source 
Fix NPC hitbox scaling for large sizes
This commit is contained in:
Kam authored and GitHub committed 2025-10-20 14:46:06 -04:00
2 parents 111f16647d 3d9b54ef5b
commit aaa07eeec6
6 files changed
+70 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/entity/EntityCustomNpc.java
+13 -12
View File
@@ -68,24 +68,25 @@ public class EntityCustomNpc extends EntityNPCFlying {
} else {
if (entity instanceof EntityNPCInterface)
((EntityNPCInterface) entity).updateHitbox();
width = (entity.width / 5f) * display.modelSize;
height = (entity.height / 5f) * display.modelSize;
float newWidth = (entity.width / 5f) * display.modelSize;
float newHeight = (entity.height / 5f) * display.modelSize;
if (display.hitboxData.isHitboxEnabled()) {
width = width * display.hitboxData.getWidthScale();
height = height * display.hitboxData.getHeightScale();
newWidth = newWidth * display.hitboxData.getWidthScale();
newHeight = newHeight * display.hitboxData.getHeightScale();
}
if (width < 0.1f)
width = 0.1f;
if (height < 0.1f)
height = 0.1f;
if (isKilled() && stats.hideKilledBody) {
width = 0.00001f;
}
if (width / 2 > worldObj.MAX_ENTITY_RADIUS) {
worldObj.MAX_ENTITY_RADIUS = width / 2;
newWidth = 0.00001f;
}
newWidth = Math.max(newWidth, 0.00001f);
newHeight = Math.max(newHeight, 0.00001f);
if (newWidth / 2 > worldObj.MAX_ENTITY_RADIUS) {
worldObj.MAX_ENTITY_RADIUS = newWidth / 2;
}
setSize(newWidth, newHeight);
this.setPosition(posX, posY, posZ);
}
}
src/main/java/noppes/npcs/entity/EntityNPCGolem.java
+12 -5
View File
@@ -25,14 +25,21 @@ public class EntityNPCGolem extends EntityNPCInterface {
public void updateHitbox() {
currentAnimation = EnumAnimation.values()[dataWatcher.getWatchableObjectInt(14)];
float newWidth;
float newHeight;
if (currentAnimation == EnumAnimation.LYING) {
width = height = 0.5f;
newWidth = 0.5f;
newHeight = 0.5f;
} else if (currentAnimation == EnumAnimation.SITTING) {
width = 1.4f;
height = 2f;
newWidth = 1.4f;
newHeight = 2f;
} else {
width = 1.4f;
height = 2.5f;
newWidth = 1.4f;
newHeight = 2.5f;
}
setSize(newWidth, newHeight);
if (width / 2 > World.MAX_ENTITY_RADIUS) {
World.MAX_ENTITY_RADIUS = width / 2;
}
}
src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+21 -13
View File
@@ -1199,30 +1199,38 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
public void updateHitbox() {
float newWidth;
float newHeight;
if (currentAnimation == EnumAnimation.LYING || currentAnimation == EnumAnimation.CRAWLING) {
width = 0.8f;
height = 0.4f;
newWidth = 0.8f;
newHeight = 0.4f;
} else if (isRiding()) {
width = 0.6f;
height = baseHeight * 0.77f;
newWidth = 0.6f;
newHeight = baseHeight * 0.77f;
} else {
width = 0.6f;
height = baseHeight;
newWidth = 0.6f;
newHeight = baseHeight;
}
width = (width / 5f) * display.modelSize;
height = (height / 5f) * display.modelSize;
newWidth = (newWidth / 5f) * display.modelSize;
newHeight = (newHeight / 5f) * display.modelSize;
if (display.hitboxData.isHitboxEnabled()) {
width = width * display.hitboxData.getWidthScale();
height = height * display.hitboxData.getHeightScale();
newWidth = newWidth * display.hitboxData.getWidthScale();
newHeight = newHeight * display.hitboxData.getHeightScale();
}
if (isKilled() && stats.hideKilledBody) {
width = 0.00001f;
newWidth = 0.00001f;
}
if (width / 2 > World.MAX_ENTITY_RADIUS) {
World.MAX_ENTITY_RADIUS = width / 2;
newWidth = Math.max(newWidth, 0.00001f);
newHeight = Math.max(newHeight, 0.00001f);
if (newWidth / 2 > World.MAX_ENTITY_RADIUS) {
World.MAX_ENTITY_RADIUS = newWidth / 2;
}
setSize(newWidth, newHeight);
this.setPosition(posX, posY, posZ);
}
src/main/java/noppes/npcs/entity/EntityNpcDragon.java
+4 -2
View File
@@ -114,8 +114,10 @@ public class EntityNpcDragon extends EntityNPCInterface {
// }
@Override
public void updateHitbox() {
width = 1.8f;
height = 1.4f;
setSize(1.8f, 1.4f);
if (width / 2 > World.MAX_ENTITY_RADIUS) {
World.MAX_ENTITY_RADIUS = width / 2;
}
}
}
src/main/java/noppes/npcs/entity/EntityNpcSlime.java
+4 -2
View File
@@ -17,8 +17,10 @@ public class EntityNpcSlime extends EntityNPCInterface {
@Override
public void updateHitbox() {
width = 0.8f;
height = 0.8f;
setSize(0.8f, 0.8f);
if (width / 2 > World.MAX_ENTITY_RADIUS) {
World.MAX_ENTITY_RADIUS = width / 2;
}
}
@Override
src/main/java/noppes/npcs/entity/old/EntityNPCEnderman.java
+16 -7
View File
@@ -24,17 +24,26 @@ public class EntityNPCEnderman extends EntityNpcEnderchibi {
public void updateHitbox() {
float newWidth;
float newHeight;
if (currentAnimation == EnumAnimation.LYING) {
width = height = 0.2f;
newWidth = 0.2f;
newHeight = 0.2f;
} else if (currentAnimation == EnumAnimation.SITTING) {
width = 0.6f;
height = 2.3f;
newWidth = 0.6f;
newHeight = 2.3f;
} else {
width = 0.6f;
height = 2.9f;
newWidth = 0.6f;
newHeight = 2.9f;
}
newWidth = (newWidth / 5f) * display.modelSize;
newHeight = (newHeight / 5f) * display.modelSize;
newWidth = Math.max(newWidth, 0.00001f);
newHeight = Math.max(newHeight, 0.00001f);
setSize(newWidth, newHeight);
if (width / 2 > World.MAX_ENTITY_RADIUS) {
World.MAX_ENTITY_RADIUS = width / 2;
}
width = (width / 5f) * display.modelSize;
height = (height / 5f) * display.modelSize;
}
public void onUpdate() {