AY 4 jaren geleden
bovenliggende
commit
9726fc43e4

BIN
__debug_bin


+ 27 - 6
mc_add.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"net/http"
+	"regexp"
 	"strconv"
 	"time"
 )
@@ -23,8 +24,13 @@ func AddBanPlayer(w http.ResponseWriter, r *http.Request) {
 	Source := "ArOZ Minecraft Terminal"
 	Expires := "forever"
 	Reason, _ := mv(r, "reason", false)
-	Config.WriteBannedPlayer(UUID, Name, Created, Source, Expires, Reason)
-	sendJSONResponse(w, "OK")
+	if IsValidUUID(UUID) {
+		Config.WriteBannedPlayer(UUID, Name, Created, Source, Expires, Reason)
+		sendJSONResponse(w, "OK")
+	} else {
+		sendJSONResponse(w, "Incorrect UUID.")
+	}
+
 }
 
 func AddOps(w http.ResponseWriter, r *http.Request) {
@@ -34,18 +40,33 @@ func AddOps(w http.ResponseWriter, r *http.Request) {
 	LevelI, _ := strconv.Atoi(Level)
 	BypassesPlayerLimit, _ := mv(r, "bypass", false)
 	BypassesPlayerLimitB, _ := strconv.ParseBool(BypassesPlayerLimit)
-	Config.WriteOps(UUID, Name, LevelI, BypassesPlayerLimitB)
-	sendJSONResponse(w, "OK")
+	if IsValidUUID(UUID) {
+		Config.WriteOps(UUID, Name, LevelI, BypassesPlayerLimitB)
+		sendJSONResponse(w, "OK")
+	} else {
+		sendJSONResponse(w, "Incorrect UUID.")
+	}
 }
 
 func AddWhitelist(w http.ResponseWriter, r *http.Request) {
 	UUID, _ := mv(r, "uuid", false)
 	Name, _ := mv(r, "name", false)
-	Config.WriteWhitelist(UUID, Name)
-	sendJSONResponse(w, "OK")
+	if IsValidUUID(UUID) {
+		Config.WriteWhitelist(UUID, Name)
+		sendJSONResponse(w, "OK")
+	} else {
+		sendJSONResponse(w, "Incorrect UUID.")
+	}
 }
 
 func currentTime() string {
 	t := time.Now()
 	return t.Format("2006-01-02 15:04:05 -0700")
 }
+
+//vaild UUID
+//https://stackoverflow.com/questions/25051675/how-to-validate-uuid-v4-in-go
+func IsValidUUID(uuid string) bool {
+	r := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$")
+	return r.MatchString(uuid)
+}

+ 1 - 9
server/banned-ips.json

@@ -1,9 +1 @@
-[
-  {
-    "ip": "127.0.0.1",
-    "created": "2020-12-19 16:30:59 -0800",
-    "source": "Alanyeung",
-    "expires": "forever",
-    "reason": "fuckyou"
-  }
-]
+[]

+ 114 - 0
server/logs/latest 3.log

@@ -0,0 +1,114 @@
+[23:01:05] [main/INFO]: Environment: authHost='https://authserver.mojang.com', accountsHost='https://api.mojang.com', sessionHost='https://sessionserver.mojang.com', servicesHost='https://api.minecraftservices.com', name='PROD'
+[23:01:07] [main/WARN]: Ambiguity between arguments [teleport, destination] and [teleport, targets] with inputs: [Player, 0123, @e, dd12be42-52a9-4a91-a8a1-11c01849e498]
+[23:01:07] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
+[23:01:07] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, targets] with inputs: [0.1 -0.5 .9, 0 0 0]
+[23:01:07] [main/WARN]: Ambiguity between arguments [teleport, targets] and [teleport, destination] with inputs: [Player, 0123, dd12be42-52a9-4a91-a8a1-11c01849e498]
+[23:01:07] [main/WARN]: Ambiguity between arguments [teleport, targets, location] and [teleport, targets, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
+[23:01:07] [main/INFO]: Reloading ResourceManager: Default
+[23:01:09] [Worker-Main-14/INFO]: Loaded 7 recipes
+[23:01:10] [Worker-Main-14/INFO]: Loaded 927 advancements
+[23:01:16] [Server thread/INFO]: Starting minecraft server version 1.16.4
+[23:01:16] [Server thread/INFO]: Loading properties
+[23:01:16] [Server thread/INFO]: Default game type: CREATIVE
+[23:01:16] [Server thread/INFO]: Generating keypair
+[23:01:17] [Server thread/INFO]: Starting Minecraft server on *:25565
+[23:01:17] [Server thread/INFO]: Using default channel type
+[23:01:18] [Server thread/INFO]: Preparing level "world"
+[23:01:18] [Server thread/INFO]: Preparing start region for dimension minecraft:overworld
+[23:01:25] [User Authenticator #1/INFO]: UUID of player Alanyeung is 3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f
+[23:01:27] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:27] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:28] [Worker-Main-14/INFO]: Preparing spawn area: 0%
+[23:01:28] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[23:01:29] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[23:01:29] [Worker-Main-9/INFO]: Preparing spawn area: 0%
+[23:01:30] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[23:01:30] [Worker-Main-14/INFO]: Preparing spawn area: 0%
+[23:01:31] [Worker-Main-13/INFO]: Preparing spawn area: 1%
+[23:01:31] [Worker-Main-13/INFO]: Preparing spawn area: 1%
+[23:01:32] [Worker-Main-13/INFO]: Preparing spawn area: 2%
+[23:01:32] [Worker-Main-13/INFO]: Preparing spawn area: 2%
+[23:01:33] [Worker-Main-10/INFO]: Preparing spawn area: 3%
+[23:01:33] [Worker-Main-8/INFO]: Preparing spawn area: 3%
+[23:01:34] [Worker-Main-11/INFO]: Preparing spawn area: 4%
+[23:01:34] [Worker-Main-14/INFO]: Preparing spawn area: 4%
+[23:01:35] [Worker-Main-9/INFO]: Preparing spawn area: 6%
+[23:01:35] [Worker-Main-8/INFO]: Preparing spawn area: 6%
+[23:01:36] [Worker-Main-9/INFO]: Preparing spawn area: 6%
+[23:01:36] [Worker-Main-14/INFO]: Preparing spawn area: 6%
+[23:01:38] [Worker-Main-14/INFO]: Preparing spawn area: 9%
+[23:01:38] [Worker-Main-8/INFO]: Preparing spawn area: 9%
+[23:01:38] [Worker-Main-8/INFO]: Preparing spawn area: 9%
+[23:01:38] [Worker-Main-13/INFO]: Preparing spawn area: 9%
+[23:01:39] [Worker-Main-13/INFO]: Preparing spawn area: 9%
+[23:01:39] [Worker-Main-10/INFO]: Preparing spawn area: 9%
+[23:01:40] [Worker-Main-8/INFO]: Preparing spawn area: 9%
+[23:01:40] [Worker-Main-13/INFO]: Preparing spawn area: 9%
+[23:01:41] [Worker-Main-13/INFO]: Preparing spawn area: 15%
+[23:01:41] [Worker-Main-12/INFO]: Preparing spawn area: 15%
+[23:01:42] [Worker-Main-11/INFO]: Preparing spawn area: 16%
+[23:01:42] [Worker-Main-14/INFO]: Preparing spawn area: 16%
+[23:01:43] [Worker-Main-9/INFO]: Preparing spawn area: 17%
+[23:01:43] [Worker-Main-10/INFO]: Preparing spawn area: 17%
+[23:01:44] [Worker-Main-12/INFO]: Preparing spawn area: 17%
+[23:01:44] [Worker-Main-11/INFO]: Preparing spawn area: 19%
+[23:01:45] [Worker-Main-14/INFO]: Preparing spawn area: 21%
+[23:01:45] [Worker-Main-14/INFO]: Preparing spawn area: 21%
+[23:01:46] [Worker-Main-10/INFO]: Preparing spawn area: 27%
+[23:01:46] [Worker-Main-9/INFO]: Preparing spawn area: 30%
+[23:01:47] [Worker-Main-13/INFO]: Preparing spawn area: 32%
+[23:01:47] [Worker-Main-8/INFO]: Preparing spawn area: 35%
+[23:01:48] [Worker-Main-8/INFO]: Preparing spawn area: 38%
+[23:01:48] [Worker-Main-14/INFO]: Preparing spawn area: 41%
+[23:01:49] [Worker-Main-13/INFO]: Preparing spawn area: 44%
+[23:01:49] [Worker-Main-14/INFO]: Preparing spawn area: 44%
+[23:01:50] [Worker-Main-11/INFO]: Preparing spawn area: 47%
+[23:01:50] [Worker-Main-10/INFO]: Preparing spawn area: 47%
+[23:01:51] [Worker-Main-14/INFO]: Preparing spawn area: 55%
+[23:01:52] [Worker-Main-10/INFO]: Preparing spawn area: 57%
+[23:01:53] [Worker-Main-14/INFO]: Preparing spawn area: 61%
+[23:01:53] [Worker-Main-11/INFO]: Preparing spawn area: 61%
+[23:01:53] [Worker-Main-10/INFO]: Preparing spawn area: 67%
+[23:01:53] [Worker-Main-9/INFO]: Preparing spawn area: 71%
+[23:01:54] [Worker-Main-14/INFO]: Preparing spawn area: 74%
+[23:01:55] [Worker-Main-8/INFO]: Preparing spawn area: 79%
+[23:01:55] [Worker-Main-11/INFO]: Preparing spawn area: 83%
+[23:01:55] [Worker-Main-9/INFO]: Preparing spawn area: 86%
+[23:01:56] [Worker-Main-10/INFO]: Preparing spawn area: 90%
+[23:01:56] [Worker-Main-14/INFO]: Preparing spawn area: 94%
+[23:01:57] [User Authenticator #2/INFO]: UUID of player Alanyeung is 3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f
+[23:01:57] [Worker-Main-8/INFO]: Preparing spawn area: 96%
+[23:01:57] [Server thread/INFO]: Time elapsed: 39215 ms
+[23:01:57] [Server thread/INFO]: Done (39.339s)! For help, type "help"
+[23:01:57] [Server thread/INFO]: com.mojang.authlib.GameProfile@4fdfc9d8[id=3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f,name=Alanyeung,properties={textures=[com.mojang.authlib.properties.Property@6074d53]},legacy=false] (/127.0.0.1:55409) lost connection: Disconnected
+[23:01:57] [Server thread/INFO]: Disconnecting com.mojang.authlib.GameProfile@7b1a6eeb[id=3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f,name=Alanyeung,properties={textures=[com.mojang.authlib.properties.Property@2034459d]},legacy=false] (/127.0.0.1:55427): Your IP address is banned from this server.
+Reason: fuckyou
+[23:01:58] [Server thread/INFO]: com.mojang.authlib.GameProfile@7b1a6eeb[id=3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f,name=Alanyeung,properties={textures=[com.mojang.authlib.properties.Property@2034459d]},legacy=false] (/127.0.0.1:55427) lost connection: Your IP address is banned from this server.
+Reason: fuckyou
+[23:02:10] [Server thread/INFO]: That player does not exist
+[23:02:32] [Server thread/INFO]: Unbanned IP 127.0.0.1
+[23:02:36] [User Authenticator #3/INFO]: UUID of player Alanyeung is 3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f
+[23:02:36] [Server thread/INFO]: Alanyeung[/127.0.0.1:55502] logged in with entity id 314 at (-67.0308677822083, 90.68292493599476, -414.72143918173776)
+[23:02:36] [Server thread/INFO]: Alanyeung joined the game
+[23:02:40] [Server thread/WARN]: Can't keep up! Is the server overloaded? Running 3659ms or 73 ticks behind
+[23:03:05] [Server thread/INFO]: Villager bfj['Villager'/470, l='ServerLevel[world]', x=61.70, y=73.00, z=-388.39] died, message: 'Villager suffocated in a wall'
+[23:03:13] [Server thread/INFO]: Alanyeung lost connection: Disconnected
+[23:03:13] [Server thread/INFO]: Alanyeung left the game

+ 2 - 2
server/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sat Dec 19 16:28:46 PST 2020
+#Mon Dec 21 23:01:05 PST 2020
 enable-jmx-monitoring=false
 rcon.port=25575
 level-seed=
@@ -15,8 +15,8 @@ generate-structures=true
 difficulty=easy
 network-compression-threshold=256
 max-tick-time=60000
-use-native-transport=true
 max-players=99
+use-native-transport=true
 online-mode=true
 enable-status=true
 allow-flight=false

+ 1 - 1
server/usercache.json

@@ -1 +1 @@
-[{"name":"Alanyeung","uuid":"3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f","expiresOn":"2021-01-19 16:30:01 -0800"},{"name":"You","uuid":"0e324e7f-e78e-4777-b501-7ae08a65b1eb","expiresOn":"2021-01-16 22:53:35 -0800"},{"name":"Admin","uuid":"f680df9b-ac5c-4d3f-9bac-75bc0e316afa","expiresOn":"2021-01-16 22:53:28 -0800"},{"name":"Steve","uuid":"8667ba71-b85a-4004-af54-457a9734eed7","expiresOn":"2021-01-16 22:53:26 -0800"},{"name":"Who","uuid":"f6591220-1b72-4c34-af36-6bae126bd825","expiresOn":"2021-01-16 22:53:18 -0800"},{"name":"HyperXraft","uuid":"2561594a-c282-4ab7-b50c-068770cb9c6c","expiresOn":"2021-01-15 23:44:27 -0800"}]
+[{"name":"Alanyeung","uuid":"3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f","expiresOn":"2021-01-21 23:02:36 -0800"},{"name":"You","uuid":"0e324e7f-e78e-4777-b501-7ae08a65b1eb","expiresOn":"2021-01-16 22:53:35 -0800"},{"name":"Admin","uuid":"f680df9b-ac5c-4d3f-9bac-75bc0e316afa","expiresOn":"2021-01-16 22:53:28 -0800"},{"name":"Steve","uuid":"8667ba71-b85a-4004-af54-457a9734eed7","expiresOn":"2021-01-16 22:53:26 -0800"},{"name":"Who","uuid":"f6591220-1b72-4c34-af36-6bae126bd825","expiresOn":"2021-01-16 22:53:18 -0800"},{"name":"HyperXraft","uuid":"2561594a-c282-4ab7-b50c-068770cb9c6c","expiresOn":"2021-01-15 23:44:27 -0800"}]

BIN
server/world/level.dat


BIN
server/world/level.dat_old


BIN
server/world/poi/r.0.-1.mca


BIN
server/world/region/r.-1.-1 3.mca


BIN
server/world/region/r.-1.-2.mca


+ 0 - 0
server/world/region/r.-1.0 3.mca


+ 0 - 0
server/world/region/r.0.-1 3.mca


BIN
server/world/region/r.0.-2.mca


+ 0 - 0
server/world/region/r.0.0 3.mca


+ 1 - 1
server/world/stats/3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f.json

@@ -1 +1 @@
-{"stats":{"minecraft:custom":{"minecraft:time_since_rest":38189,"minecraft:sprint_one_cm":21799,"minecraft:damage_taken":2025,"minecraft:walk_one_cm":65929,"minecraft:mob_kills":670,"minecraft:damage_dealt":48,"minecraft:fly_one_cm":703369,"minecraft:play_one_minute":146134,"minecraft:crouch_one_cm":111,"minecraft:deaths":11,"minecraft:sneak_time":670,"minecraft:walk_under_water_one_cm":6354,"minecraft:aviate_one_cm":131205,"minecraft:jump":338,"minecraft:leave_game":39,"minecraft:time_since_death":38161,"minecraft:walk_on_water_one_cm":9924,"minecraft:fall_one_cm":10122},"minecraft:used":{"minecraft:creeper_spawn_egg":23,"minecraft:oak_log":94,"minecraft:lever":18,"minecraft:flint_and_steel":6,"minecraft:command_block":2,"minecraft:grass_block":1,"minecraft:stone":7,"minecraft:fire_charge":10,"minecraft:tnt":371,"minecraft:oak_sapling":2,"minecraft:snowball":736},"minecraft:killed_by":{"minecraft:wolf":2,"minecraft:creeper":2},"minecraft:mined":{"minecraft:oak_sapling":1,"minecraft:birch_leaves":4,"minecraft:grass":1,"minecraft:grass_block":1,"minecraft:oak_log":20,"minecraft:oak_leaves":37},"minecraft:picked_up":{"minecraft:stick":9,"minecraft:andesite":8,"minecraft:dandelion":1,"minecraft:gravel":62,"minecraft:flint":3,"minecraft:oak_log":26,"minecraft:diorite":2,"minecraft:gunpowder":7,"minecraft:redstone":9,"minecraft:dirt":237,"minecraft:apple":1,"minecraft:wheat_seeds":1,"minecraft:creeper_spawn_egg":64,"minecraft:lever":2,"minecraft:granite":10,"minecraft:oak_sapling":16,"minecraft:cobblestone":149},"minecraft:killed":{"minecraft:sheep":7,"minecraft:skeleton":10,"minecraft:zombie":15,"minecraft:donkey":2,"minecraft:pig":5,"minecraft:chicken":8,"minecraft:salmon":5,"minecraft:silverfish":570,"minecraft:spider":3,"minecraft:bat":8,"minecraft:creeper":12,"minecraft:squid":8,"minecraft:cow":8}},"DataVersion":2584}
+{"stats":{"minecraft:killed":{"minecraft:sheep":7,"minecraft:skeleton":10,"minecraft:zombie":15,"minecraft:donkey":2,"minecraft:pig":5,"minecraft:chicken":8,"minecraft:salmon":5,"minecraft:silverfish":570,"minecraft:spider":3,"minecraft:bat":8,"minecraft:creeper":12,"minecraft:squid":8,"minecraft:cow":8},"minecraft:custom":{"minecraft:time_since_rest":38859,"minecraft:sprint_one_cm":21799,"minecraft:damage_taken":2025,"minecraft:walk_one_cm":65929,"minecraft:mob_kills":670,"minecraft:damage_dealt":48,"minecraft:fly_one_cm":703369,"minecraft:play_one_minute":146804,"minecraft:crouch_one_cm":111,"minecraft:deaths":11,"minecraft:sneak_time":670,"minecraft:walk_under_water_one_cm":6354,"minecraft:aviate_one_cm":131205,"minecraft:jump":338,"minecraft:leave_game":40,"minecraft:time_since_death":38831,"minecraft:walk_on_water_one_cm":9924,"minecraft:fall_one_cm":10122},"minecraft:picked_up":{"minecraft:stick":9,"minecraft:andesite":8,"minecraft:dandelion":1,"minecraft:gravel":62,"minecraft:flint":3,"minecraft:oak_log":26,"minecraft:diorite":2,"minecraft:gunpowder":7,"minecraft:redstone":9,"minecraft:dirt":237,"minecraft:apple":1,"minecraft:wheat_seeds":1,"minecraft:creeper_spawn_egg":64,"minecraft:lever":2,"minecraft:granite":10,"minecraft:oak_sapling":16,"minecraft:cobblestone":149},"minecraft:mined":{"minecraft:oak_sapling":1,"minecraft:birch_leaves":4,"minecraft:grass":1,"minecraft:grass_block":1,"minecraft:oak_log":20,"minecraft:oak_leaves":37},"minecraft:killed_by":{"minecraft:wolf":2,"minecraft:creeper":2},"minecraft:used":{"minecraft:creeper_spawn_egg":23,"minecraft:oak_log":94,"minecraft:lever":18,"minecraft:flint_and_steel":6,"minecraft:command_block":2,"minecraft:grass_block":1,"minecraft:stone":7,"minecraft:fire_charge":10,"minecraft:tnt":371,"minecraft:oak_sapling":2,"minecraft:snowball":736}},"DataVersion":2584}

+ 3 - 3
webroot/info.html

@@ -72,7 +72,7 @@
 
 </body>
 <script>
-    var refreshInfo;
+    updateInfo();
     var currentOnlineUser = [];
     setInterval(function() {
         updateInfo()
@@ -99,9 +99,9 @@
 
     function updateInfo() {
         $.get("serverinfo", function(data) {
-            if(data.IsRunning){
+            if (data.IsRunning) {
                 $("#status").text("Started.");
-            }else{
+            } else {
                 $("#status").text("Stopped.");
             }
             $("#userlist").html(`

+ 2 - 1
webroot/log.html

@@ -32,10 +32,11 @@
     var loading = false;
 
     //to fix the fucking log textbox size.
-    $(window).on('resize', function(){
+    $(window).on('resize', function() {
         $("#log").height(window.innerHeight - $("#command").height() - 105)
     });
 
+    refreshLog();
     setInterval(function() {
         refreshLog()
     }, 1000);

+ 2 - 0
webroot/players.html

@@ -24,6 +24,8 @@
 <script>
     var refreshInfo;
     var currentOnlineUser = [];
+
+    updateInfo();
     setInterval(function() {
         updateInfo()
     }, 5000);