Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 06:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DarkflameUniverse:main' into main

Browse Source
This commit is contained in:
Nils Bergmann 2021-12-16 14:51:16 +01:00 committed by GitHub
commit 279fa076d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug_report.yaml vendored
View File

@ -7,6 +7,7 @@ body:
- type: checkboxes - type: checkboxes
id: checks id: checks
attributes: attributes:
label: "Make sure you've done the following:"
options: options:
- label: > - label: >
I have checked that this issue has not already been reported. I have checked that this issue has not already been reported.

2
.github/ISSUE_TEMPLATE/documentation_improvement.yaml vendored
View File

@ -5,7 +5,9 @@ labels: ["docs", "triage"]
body: body:
- type: checkboxes - type: checkboxes
id: checks
attributes: attributes:
label: "Make sure you've done the following:"
options: options:
- label: > - label: >
I have checked that this issue has not already been reported. I have checked that this issue has not already been reported.

1
.github/ISSUE_TEMPLATE/installation_issue.yaml vendored
View File

@ -7,6 +7,7 @@ body:
- type: checkboxes - type: checkboxes
id: checks id: checks
attributes: attributes:
label: "Make sure you've done the following:"
options: options:
- label: > - label: >
I have read the [installation guide](https://github.com/DarkflameUniverse/DarkflameServer/blob/main/README.md). I have read the [installation guide](https://github.com/DarkflameUniverse/DarkflameServer/blob/main/README.md).

1
.github/ISSUE_TEMPLATE/performance_issue.yaml vendored
View File

@ -7,6 +7,7 @@ body:
- type: checkboxes - type: checkboxes
id: checks id: checks
attributes: attributes:
label: "Make sure you've done the following:"
options: options:
- label: > - label: >
I have checked that this issue has not already been reported. I have checked that this issue has not already been reported.

4
README.md
View File

@ -289,10 +289,10 @@ Here is a summary of the commands available in-game. All commands are prefixed b
</tr> </tr>
<tr> <tr>
<td> <td>
instance-info instanceinfo
</td> </td>
<td> <td>
/instance-info /instanceinfo
</td> </td>
<td> <td>
Displays in the chat the current zone, clone, and instance id. Displays in the chat the current zone, clone, and instance id.

4
dGame/dUtilities/SlashCommandHandler.cpp
View File

@ -407,7 +407,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
stmt->execute(); stmt->execute();
delete stmt; delete stmt;
if (chatCommand == "setMinifig" && args.size() == 2 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_FORUM_MODERATOR) { // could break characters so only allow if GM > 0 if (chatCommand == "setminifig" && args.size() == 2 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_FORUM_MODERATOR) { // could break characters so only allow if GM > 0
int32_t minifigItemId; int32_t minifigItemId;
if (!GeneralUtils::TryParse(args[1], minifigItemId)) { if (!GeneralUtils::TryParse(args[1], minifigItemId)) {
ChatPackets::SendSystemMessage(sysAddr, u"Invalid Minifig Item Id ID."); ChatPackets::SendSystemMessage(sysAddr, u"Invalid Minifig Item Id ID.");
@ -434,7 +434,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
charComp->m_Character->SetMouth(minifigItemId); charComp->m_Character->SetMouth(minifigItemId);
} else if (lowerName == "righthand") { } else if (lowerName == "righthand") {
charComp->m_Character->SetRightHand(minifigItemId); charComp->m_Character->SetRightHand(minifigItemId);
} else if (lowerName == "shirt") { } else if (lowerName == "shirtcolor") {
charComp->m_Character->SetShirtColor(minifigItemId); charComp->m_Character->SetShirtColor(minifigItemId);
} else if (lowerName == "hands") { } else if (lowerName == "hands") {
charComp->m_Character->SetLeftHand(minifigItemId); charComp->m_Character->SetLeftHand(minifigItemId);