Fixed meshes with Walk and Pysical intentions were treated as physical only.

Yeats-bynd · Yeats-bynd · commit a6ef3956ed97 · 2020-10-25T19:07:02.000+01:00
diff --git a/src/main/java/com/aionemu/geobuilder/CollisionIntention.java b/src/main/java/com/aionemu/geobuilder/CollisionIntention.java
@@ -8,7 +8,8 @@ public enum CollisionIntention {
   WALK(1 << 3), // Walk/NoWalk obstacles
   DOOR(1 << 4), // Doors which have a state opened/closed
   EVENT(1 << 5), // Appear on event only
-  MOVEABLE(1 << 6); // Ships, shugo boxes
+  MOVEABLE(1 << 6), // Ships, shugo boxes
+  PHYSICAL_SEE_THROUGH(1 << 7);
 
   private final short id;
 
diff --git a/src/main/java/com/aionemu/geobuilder/loaders/CgfLoader.java b/src/main/java/com/aionemu/geobuilder/loaders/CgfLoader.java
@@ -701,10 +701,11 @@ private void traverseNodesInternal(int recursiveDepth, List<MeshData> meshes, Li
               meshData.materialId = matData.materialId;
             }
             if (matData.materialId >= 1 && matData.materialId <= 9) {
-              if (matData.materialId > 5) {
-                meshData.collisionIntention = 0;
+              meshData.collisionIntention = 0;
+              if (matData.materialId <= 5) {
+                meshData.collisionIntention |= CollisionIntention.PHYSICAL_SEE_THROUGH.getId(); // players and npcs cant move but see through
               }
-              meshData.collisionIntention |= CollisionIntention.WALK.getId();
+              meshData.collisionIntention |= CollisionIntention.WALK.getId(); // npcs cannot walk through
             }
             meshes.add(meshData);
           }

Original file line number	Diff line number	Diff line change
`@@ -701,10 +701,11 @@ private void traverseNodesInternal(int recursiveDepth, List<MeshData> meshes, Li`
`701`	`701`	`meshData.materialId = matData.materialId;`
`702`	`702`	`}`
`703`	`703`	`if (matData.materialId >= 1 && matData.materialId <= 9) {`
`704`		`- if (matData.materialId > 5) {`
`705`		`- meshData.collisionIntention = 0;`
	`704`	`+ meshData.collisionIntention = 0;`
	`705`	`+ if (matData.materialId <= 5) {`
	`706`	`+ meshData.collisionIntention \|= CollisionIntention.PHYSICAL_SEE_THROUGH.getId(); // players and npcs cant move but see through`
`706`	`707`	`}`
`707`		`- meshData.collisionIntention \|= CollisionIntention.WALK.getId();`
	`708`	`+ meshData.collisionIntention \|= CollisionIntention.WALK.getId(); // npcs cannot walk through`
`708`	`709`	`}`
`709`	`710`	`meshes.add(meshData);`
`710`	`711`	`}`