diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java
index d0a5485..b6234ed 100644
--- a/src/main/java/cactusServer/models/CollisionManager.java
+++ b/src/main/java/cactusServer/models/CollisionManager.java
@@ -62,13 +62,21 @@
 				}
 			}
 		}
+		for (Player player : Instances.getInstance().getPlayers(instanceId).values()) {
+			for (Player player2 : Instances.getInstance().getPlayers(instanceId).values()) {
+				if (!player.equals(player2)) {
+					collisionMove(player2, player);
+				}
+			}
+		}
 	}
 
 	public void collisionMove(MovableObject object, Player player) {
 		CollisionResult result;
-		result = PhysicsUtility.checkCollision((Object3D)player.getPlaceable().getBody(), null, object.getObject(), null);
-		if (result != null) {
-			System.out.println("�I�u�W�F�N�g�ƃv���C���[���Փ�");
+		result = PhysicsUtility.checkCollision((Object3D) player.getPlaceable().getBody(), null, object.getObject(),
+				null);
+		if (result != null) {
+			System.out.println("�I�u�W�F�N�g�ƃv���C���[���Փ�");
 			objMove(result, object, false);
 		}
 	}
@@ -88,6 +96,16 @@
 		}
 	}
 
+	public void collisionMove(Player player1, Player player2) {
+		CollisionResult result;
+		result = PhysicsUtility.checkCollision((Object3D) player1.getPlaceable(), null,
+				(Object3D) player2.getPlaceable(), null);
+		if (result != null) {
+			System.out.println("�v���C���[���m���Փ�");
+			objMove(result, player1, true);
+		}
+	}
+
 	private void objMove(CollisionResult result, MovableObject object, boolean negate) {
 		result.normal.scale(-1);
 		Vector3d vec = object.getPosition().getVector3d();
@@ -96,7 +114,16 @@
 		vec.add(result.normal);
 		object.setPosition(new Position3D(vec));
 	}
-	
+
+	private void objMove(CollisionResult result, Player player, boolean negate) {
+		result.normal.scale(-1);
+		Vector3d vec = player.getPosition().getVector3d();
+		if (negate)
+			result.normal.negate();
+		vec.add(result.normal);
+		player.setPosition(new Position3D(vec));
+	}
+
 	private void collisionBulletsAndOthers(String instanceId, Instance instance) {
 		collisionBulletAndOtherBullets(instance);
 		for (Map.Entry<String, HashMap<String, Bullet>> playersBulletsEntry : instance.getBullets().entrySet()) {
@@ -104,10 +131,12 @@
 			Map<String, Bullet> bulletMap = playersBulletsEntry.getValue();
 			for (Map.Entry<String, Bullet> bulletEntry : bulletMap.entrySet()) {
 				Bullet bullet = bulletEntry.getValue();
-				if (!bullet.isAlive()) continue;
+				if (!bullet.isAlive())
+					continue;
 				String bulletId = bulletEntry.getKey();
 				collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, bullet);
-				if (!bullet.isAlive()) continue;
+				if (!bullet.isAlive())
+					continue;
 				collisionBulletAndObjects(instance, bulletOwnerPlayerId, bulletId, bullet);
 			}
 		}
@@ -129,7 +158,7 @@
 		}
 		return false;
 	}
-	
+
 	private boolean collisionBulletAndObjects(Instance instance, String bulletOwnerPlayerId, String bulletId,
 			Bullet bullet) {
 		for (MovableObject object : instance.getObjects().values()) {
@@ -141,7 +170,7 @@
 		}
 		return false;
 	}
-	
+
 	private void collisionBulletAndOtherBullets(Instance instance) {
 		List<Map.Entry<String, Bullet>> allBulletsEntryList = new ArrayList<>();
 		for (HashMap<String, Bullet> playerBullets : instance.getBullets().values()) {
@@ -150,11 +179,13 @@
 		for (int i = 0; i < allBulletsEntryList.size() - 1; i++) {
 			Map.Entry<String, Bullet> bulletEntry1 = allBulletsEntryList.get(i);
 			Bullet bullet1 = bulletEntry1.getValue();
-			if (!bullet1.isAlive()) continue;
+			if (!bullet1.isAlive())
+				continue;
 			for (int j = i + 1; j < allBulletsEntryList.size(); j++) {
 				Map.Entry<String, Bullet> bulletEntry2 = allBulletsEntryList.get(j);
 				Bullet bullet2 = bulletEntry2.getValue();
-				if (!bullet2.isAlive()) continue;
+				if (!bullet2.isAlive())
+					continue;
 				if (isCollision(bullet1, bullet2)) {
 					bullet1.setAlive(false);
 					bullet2.setAlive(false);
@@ -167,7 +198,8 @@
 
 	private boolean isCollision(Bullet bullet, Player player) {
 		CollisionResult result;
-		result = PhysicsUtility.checkCollision((Object3D) (bullet.getPlaceable()), null, (Object3D)player.getPlaceable().getBody(), null);
+		result = PhysicsUtility.checkCollision((Object3D) (bullet.getPlaceable()), null,
+				(Object3D) player.getPlaceable().getBody(), null);
 		return (result != null);
 	}
 
@@ -176,10 +208,11 @@
 		result = PhysicsUtility.checkCollision((Object3D) (bullet.getPlaceable()), null, object.getObject(), null);
 		return (result != null);
 	}
-	
+
 	private boolean isCollision(Bullet bullet1, Bullet bullet2) {
 		CollisionResult result;
-		result = PhysicsUtility.checkCollision((Object3D) (bullet1.getPlaceable()), null, (Object3D) (bullet2.getPlaceable()), null);
+		result = PhysicsUtility.checkCollision((Object3D) (bullet1.getPlaceable()), null,
+				(Object3D) (bullet2.getPlaceable()), null);
 		return (result != null);
 	}
 }