Skip to content

Commit

Permalink
Merge pull request #268 from golters/dev
Browse files Browse the repository at this point in the history
fix
  • Loading branch information
IamtheMa authored Dec 3, 2023
2 parents 78d08ab + 0cfc878 commit bb4aa13
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion server/network/events/ufo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const handler: NetworkEventHandler = async (socket, playerID: number) => {
broadcastToUser<string>(SERVER_LOG_EVENT, "you have been abducted by aliens", player.username)
broadcastToRoom<string>(NOTIFICATION_EVENT, "teleportEnter", newroom.id);
if(Math.random() * 1000 < 1)
await createPocketItem(player.id, "alien_artifact", null, "2", "alien,artifact")
await createPocketItem(player.id, "alien_artifact", null, "2", "alien,artifact","alien,artifact")
//await insertRoomCommand(room.id, player.id, `has teleported into ${room.name}`, Date.now(), "tp")
} catch (error) {
sendEvent<string>(socket, ERROR_EVENT, error.message)
Expand Down
2 changes: 1 addition & 1 deletion server/services/npc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ export const editAvatar = async (x: number, y: number, character: string, npc: N

//create tombstone
const rooms = await getAllRooms()
const grave = await createFloorItem(Math.floor(Math.random() * rooms.length),"grave","123456123456123456","","grave")
const grave = await createFloorItem(Math.floor(Math.random() * rooms.length),"grave","123456123456123456","","grave","grave")
const birth = new Date(npc.birth)
const death = new Date(Date.now())
const byyyy = birth.getFullYear();
Expand Down

0 comments on commit bb4aa13

Please sign in to comment.