diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index b6234ed..46495a8 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -98,8 +98,8 @@ public void collisionMove(Player player1, Player player2) { CollisionResult result; - result = PhysicsUtility.checkCollision((Object3D) player1.getPlaceable(), null, - (Object3D) player2.getPlaceable(), null); + result = PhysicsUtility.checkCollision((Object3D) player1.getPlaceable().getBody(), null, + (Object3D) player2.getPlaceable().getBody(), null); if (result != null) { System.out.println("�v���C���[���m���Փ�"); objMove(result, player1, true); diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 9deb36c..0b53e96 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -91,6 +91,8 @@ Instances.getInstance().getPlayers().put("player1", player1); Player player2 = new Player("test2", "chara2", cameraState, EmoteType.DUMMY); Instances.getInstance().getPlayers().put("player2", player2); + Player player3 = new Player("test1","chara1",null,null); + Instances.getInstance().getPlayers().put("player3", player3); // �_�~�[�I�u�W�F�N�g Instances.getInstance().getInstance("test1").createObject(new Position3D(110, 110, 110), new Velocity3D(), new AngularVelocity3D(), new Quaternion3D(), new Attribute(true, 1), 0);