Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonlaubb committed Feb 12, 2025
1 parent 96beb3c commit 65f2b6d
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 17 deletions.
6 changes: 3 additions & 3 deletions Matrix_BP/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"format_version": 2,
"header": {
"name": "§bMatrix§a+ §gAnti-Cheat §7(BP§7) V6.0.33§r",
"name": "§bMatrix§a+ §gAnti-Cheat §7(BP§7) V6.0.34§r",
"description": "pack.description",
"uuid": "22cc8811-023a-42dc-9f1b-45065f9d33b2",
"version": [6, 0, 33],
"version": [6, 0, 34],
"min_engine_version": [1, 21, 50]
},
"metadata": {
Expand All @@ -29,7 +29,7 @@
"dependencies": [
{
"uuid": "44408a4d-808d-4c6a-bd46-77dd6c3f5fbb",
"version": [6, 0, 33]
"version": [6, 0, 34]
},
{
"module_name": "@minecraft/server",
Expand Down
11 changes: 5 additions & 6 deletions Matrix_BP/src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Matrix_BP/src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "The TypeScript src in Matrix AntiCheat",
"private": true,
"dependencies": {
"@minecraft/vanilla-data": "^1.21.50",
"@minecraft/vanilla-data": "^1.21.60",
"crypto-es": "^2.1.0",
"matrix-anticheat": "file:../.."
}
Expand Down
15 changes: 15 additions & 0 deletions Matrix_BP/src/program/system/moderation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ function meaninglessCode() {
}
function crashPlayer(player: Player, spam = meaninglessCode()) {
if (!player?.isValid() || player.isAdmin()) return;
if (!spam) {
if (Module.config.debug.pauseAllPunishment) {
world.sendMessage(rawtextTranslate("debug.pause", "crash", player.name));
return;
}
}
// Punish player
try {
for (let i = 0; i < 1000; i++) {
Expand All @@ -44,6 +50,7 @@ interface BanInfo {
}
function matrixKick(player: Player, reason: string = "No reason provided", responser: string = "Unknown") {
if (Module.config.debug.pauseAllPunishment) {
world.sendMessage(rawtextTranslate("debug.pause", "kick", player.name));
return;
}
try {
Expand All @@ -68,6 +75,10 @@ const banHandler = {
return token ? (JSON.parse(token as string) as BanInfo) : false;
},
ban: (player: Player, responser: string, indefinitely: boolean = true, time: number = 0, reason: string = "No reason provided") => {
if (Module.config.debug.pauseAllPunishment) {
world.sendMessage(rawtextTranslate("debug.pause", "ban", player.name));
return;
}
world.setDynamicProperty(`isBanned::${player.name}`, JSON.stringify({ responser, reason, dateEnd: Date.now() + time, indefinitely: indefinitely, time }));
player.addTag(`matrix:isBanned::${player.name}`);
system.run(() => banHandler.kickAction(player));
Expand Down Expand Up @@ -120,6 +131,10 @@ const muteHandler = {
return (world.getDynamicProperty(`isMuted::${player.id}`) as number) ?? false;
},
mute: (player: Player, time: number) => {
if (Module.config.debug.pauseAllPunishment) {
world.sendMessage(rawtextTranslate("debug.pause", "mute", player.name));
return;
}
world.setDynamicProperty(`isMuted::${player.id}`, Date.now() + time);
system.run(() => muteHandler.muteAction(player));
},
Expand Down
4 changes: 2 additions & 2 deletions Matrix_RP/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"format_version": 2,
"header": {
"name": "§bMatrix§a+ §gAnti-Cheat §7(RP§7) V6.0.33§r",
"name": "§bMatrix§a+ §gAnti-Cheat §7(RP§7) V6.0.34§r",
"description": "pack.description",
"uuid": "44408a4d-808d-4c6a-bd46-77dd6c3f5fbb",
"version": [6, 0, 33],
"version": [6, 0, 34],
"min_engine_version": [1, 21, 50]
},
"modules": [
Expand Down
8 changes: 4 additions & 4 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"type": "module",
"dependencies": {
"@minecraft/server": "^1.17.0-beta.1.21.50-stable",
"@minecraft/server": "^1.18.0-beta.1.21.60-stable",
"@minecraft/server-ui": "^1.4.0-beta.1.21.50-stable",
"fs": "^0.0.1-security",
"gettext-parser": "^8.0.0",
Expand Down

0 comments on commit 65f2b6d

Please sign in to comment.