2 files changed, 0 insertions, 21 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c
index d8fb60a9..e86439c4 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1178,7 +1178,6 @@ void ClientBegin( int clientNum )
 {
   gentity_t *ent;
   gclient_t *client;
-  gentity_t *tent;
   int       flags;
 
   ent = g_entities + clientNum;
@@ -1210,13 +1209,6 @@ void ClientBegin( int clientNum )
 
   ClientSpawn( ent, NULL, NULL, NULL );
 
-  if( client->sess.sessionTeam != TEAM_SPECTATOR )
-  {
-    // send event
-    tent = G_TempEntity( ent->client->ps.origin, EV_PLAYER_TELEPORT_IN );
-    tent->s.clientNum = ent->s.clientNum;
-  }
-
   G_InitCommandQueue( clientNum );
 
   G_SendCommandFromServer( -1, va( "print \"%s" S_COLOR_WHITE " entered the game\n\"", client->pers.netname ) );
diff --git a/src/game/g_misc.c b/src/game/g_misc.c
index b7172ea3..4bcb387f 100644
--- a/src/game/g_misc.c
+++ b/src/game/g_misc.c
@@ -66,19 +66,6 @@ TELEPORTERS
 
 void TeleportPlayer( gentity_t *player, vec3_t origin, vec3_t angles )
 {
-  gentity_t *tent;
-
-  // use temp events at source and destination to prevent the effect
-  // from getting dropped by a second player event
-  if( player->client->sess.sessionTeam != TEAM_SPECTATOR )
-  {
-    tent = G_TempEntity( player->client->ps.origin, EV_PLAYER_TELEPORT_OUT );
-    tent->s.clientNum = player->s.clientNum;
-
-    tent = G_TempEntity( origin, EV_PLAYER_TELEPORT_IN );
-    tent->s.clientNum = player->s.clientNum;
-  }
-
   // unlink to make sure it can't possibly interfere with G_KillBox
   trap_UnlinkEntity( player );