Yatopia/patches/server/0037-Add-nspt-command.patch

143 lines
6.4 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ivan Pekov <ivan@mrivanplays.com>
Date: Wed, 30 Sep 2020 18:05:45 +0300
Subject: [PATCH] Add nspt command
Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Purpur/Empirecraft) (#443) * Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Purpur/Empirecraft) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 0641de2d4 [CI-SKIP] Change some fields to textara (#5405) 98a34ea47 [CI-SKIP] 🚀 Upgrade to new form-based templates (#5278) bca97a8f7 replace spaces in world key (touches #5397) de94f6485 Refactor chat message composition (#5396) e27f334bb [CI-SKIP] Fix makemcdevsrc.sh for nms relocations (#5389) ae15e85da Updated Upstream (CraftBukkit) 26fe0ac5a Only set despawnTimer for Wandering Traders spawned by MobSpawnerTrader (#5391) b748eb7b8 Fix VanillaMobGoalTest#testBukkitMap (#5390) 18dbbb578 [Auto] Updated Upstream (CraftBukkit) fac9cc5d5 [CI-SKIP] Ignore .gitignore 087aa70e7 Deprecate ItemStack#setLore(List<String>) and ItemStack#getLore, add Component based alternatives 9889c651c apply fixup c310f0a61 Updated Upstream (Bukkit/CraftBukkit) f17560ab0 wtf is this t file -jmp 347f3a9b8 fix compile 700e9e6a5 rebase cf4dc464a Revert de5f4e469...c270abe96 6870db613 script & POM fix 743c6533c Replace ** with * (BSD/macOS) 376d7b097 Don't remove the .java fcb3fd42a Fix macOS/BSD support 8cfc05249 Link correctly ba1031ca7 Rename work dir c8d844ab7 Actually fix preloading this time e62aa5e3e Fix class preloading 1c03cf898 It's mojang math, not minecraft math 1034873df Apply fixups 39b125771 Use revision file 956150da7 Welcome to 1.16.5-R0.2 ccb217c01 Change cache keys 0d217001c more work f6d820f07 It compiles 0f78e9525 More work 1718f61bf Updated Upstream (CraftBukkit/Spigot) b28d46114 Update scripts for NMS repackaging d4532f7e7 bug #5373 - fix AsyncChatEvent not being posted when processing a legacy APCE continuation 522ae1c51 Replace all block states of a specified block (#5055) 1cda67118 [Auto] Updated Upstream (CraftBukkit) 8c74d3126 Updated Upstream (Bukkit) (#5359) fd3c66a91 bug #5362 - correctly pass "render type" when registering a new scoreboard objective Tuinity Changes: 9bdcb9b Delete work dir when running jar 6351d7c Updated Upstream (Paper) 932c199 Generate mc-dev correctly bf3e737 Make packet limiter work from IDE 1686f38 Fix packet limiter config f40f7b4 Update README.md styling (#264) da1c3ac GH Actions Changes (#213) 5f325ec Updated Upstream (Paper) 0f83fe4 Updated Upstream (Paper) 44e8e5d Do not load extra radius of chunks when loading a single chunk 31f9cae Revert custom table implementation for blockstate states 9ac33d1 Be aware of entity teleports when chunk checking entities 18c7f3f Always set impulse for projectiles to true, even if hit event failed Airplane Changes: f94d399 Merge pull request #18 from notOM3GA/upstream/nms-repackage 0fc6226 Force build for Flare update 08439d6 Updated Upstream (Tuinity) 0f80443 Updated Upstream (Tuinity) 2f6cbdc More debug for plugins not shutting down tasks 12e1b61 Updated Upstream (Tuinity) fc778d3 Update README.md db6b0eb Merge pull request #16 from DeadSteve51/patch-2 b23bee3 Remove debug 8157e98 Config style, flare style, disable tracker by def 98d0b58 Updates to README Purpur Changes: 75b07a0 Fix stack overflow on armorstand movement f754a7b Sneak to bulk process composter 1362f49 Updated Upstream (Paper, Tuinity, & Airplane) 5bf8615 [ci-skip] Conflict on change for adventure deprecations 114b37b Add purpur.yml to Flare (#204) c6dce38 forgot the crops c004236 Configurable ravager griefable blocks list 766246a [ci-skip] remove duplicate patch ac93477 Config to make Creepers explode on death (#201) 297181e Updated Upstream (Paper, Tuinity, & Airplane) 45b9a18 Config to disable Llama caravans (#203) a99a83b Allow fully disabling farmland trampling 3aa4f68 Tick fluids config 0e34d59 Add missing imports :/ 3dd9f46 Updated Upstream (Paper, Tuinity, & Airplane) Empirecraft Changes: 1b579407 Improve importmcdev script and fix first server patch f597a82e Update generatesources script 218f5298 Fix patches - imported files 847cf558 Updated Paper d51410c3 Updated Paper fb3301fd Fix bow entity ai speed/distance dbde1dc4 Add isJoined boolean to fake players a23317f7 Update Fake Player API - misc changes a970b77f Updated Paper * Updated Upstream and Sidestream(s) (Paper/Airplane/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 7259c32ba [CI-SKIP] [Auto] Rebuild Patches 0e06e912e Fix annotations so Inventory#getContents returns non-null array with nullable type (#5350) b90b4f8ad Properly apply Sign#isEditable to TEs when calling BlockState#update Airplane Changes: 87d4a17 Track queue debug command Purpur Changes: d44f93e Fix tpsbar with naughty plugins * Updated Upstream and Sidestream(s) (Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Purpur Changes: 99f1ce6 Add enchantment target for bows and crossbows af9181e Add configurable drowning settings (closes #221) (#222) f72437b Remove mcdevimports.* (#228) 08de42d Add config for infinity on crossbows (#215) 5f76cb3 Add a config for villager trading (#210) 67ffa05 Add config for disabling skipping the night (#209) * revert paper commit that made the build fail (CI still doesn't work) * Update build.yml * test2 * Update build.yml * take7 * how often does md_5 change mappings? this will come back to bite me in exactly 17 days * Revert "how often does md_5 change mappings?" This reverts commit 8b05c16d6cce156c7d8b57f5071a700b979206ef. * Updated Upstream and Sidestream(s) (Paper/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 6caa330c6 Add checkerframework nullness annotations to accepted list for AnnotationTest (#5409) Purpur Changes: 96f5360 Config to allow for unsafe enchants (#235) b6235af Rebase on latest Purpur (#230) 754948e Updated Upstream (Paper) f55c0e9 Option to make doors require redstone (closes #171) 34d5818 Fix paper using wrong annotations f31bcc6 Updated Upstream (Paper & Airplane) 55244dd Config to show Armor Stand arms on spawn (#231) c726479 Config to disable hostile mob spawn on ice `:)` (closes #214) (#229) 26a0094 Break individual slabs when sneaking (closes #218) c3de3ac Fix wart farmers plating vegetables on soul sand * Updated Upstream and Sidestream(s) (Tuinity/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 1b0d783 Updated Upstream (Paper) 2c16629 Fix NPE in NetworkManager#execute Purpur Changes: 0d25d39 Add cache for slime max health (resolves #234) 39dd78a Fix #240 - Separate slab breaking triggers every single time 1ecb9ef Projectile offsets config (#237) 33ee1e7 Configurable sponge absorption (closes #232) (#236) a0355eb Add Note Block to disabled block updates (#241) * Updated Upstream and Sidestream(s) (Paper) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 8b47131da Optimize short circuit evaluation of sign check (#5348) 1a2fd12a5 Drop carried item when player has disconnected (#5036) (#5166) 68af93524 Use PaperAdventure.PLAIN instead of PlainComponentSerializer.plain() for AdventureComponent#getString (#5414) * Updated Upstream and Sidestream(s) (Tuinity/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 94f025a Updated Upstream (Paper) ab00f31 Do not load chunks around fake players a9599d8 Fix incorrect parsing of positive target-send-rate 2a6cd81 Make sure to remove correct TE during TE tick Purpur Changes: 9dfc780 Config for powered rail activation distance (#248) Co-authored-by: duplexsystem <duplexsys@protonmail.com>
2021-03-28 16:50:47 +02:00
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2021-06-03 04:37:38 +02:00
index 70d07a7e1881d02f6d92ea65bcf9bd5a157fb2cf..75a690b149e7275eba0278033b98bdc2fff3afba 100644
Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Purpur/Empirecraft) (#443) * Updated Upstream and Sidestream(s) (Paper/Tuinity/Airplane/Purpur/Empirecraft) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 0641de2d4 [CI-SKIP] Change some fields to textara (#5405) 98a34ea47 [CI-SKIP] 🚀 Upgrade to new form-based templates (#5278) bca97a8f7 replace spaces in world key (touches #5397) de94f6485 Refactor chat message composition (#5396) e27f334bb [CI-SKIP] Fix makemcdevsrc.sh for nms relocations (#5389) ae15e85da Updated Upstream (CraftBukkit) 26fe0ac5a Only set despawnTimer for Wandering Traders spawned by MobSpawnerTrader (#5391) b748eb7b8 Fix VanillaMobGoalTest#testBukkitMap (#5390) 18dbbb578 [Auto] Updated Upstream (CraftBukkit) fac9cc5d5 [CI-SKIP] Ignore .gitignore 087aa70e7 Deprecate ItemStack#setLore(List<String>) and ItemStack#getLore, add Component based alternatives 9889c651c apply fixup c310f0a61 Updated Upstream (Bukkit/CraftBukkit) f17560ab0 wtf is this t file -jmp 347f3a9b8 fix compile 700e9e6a5 rebase cf4dc464a Revert de5f4e469...c270abe96 6870db613 script & POM fix 743c6533c Replace ** with * (BSD/macOS) 376d7b097 Don't remove the .java fcb3fd42a Fix macOS/BSD support 8cfc05249 Link correctly ba1031ca7 Rename work dir c8d844ab7 Actually fix preloading this time e62aa5e3e Fix class preloading 1c03cf898 It's mojang math, not minecraft math 1034873df Apply fixups 39b125771 Use revision file 956150da7 Welcome to 1.16.5-R0.2 ccb217c01 Change cache keys 0d217001c more work f6d820f07 It compiles 0f78e9525 More work 1718f61bf Updated Upstream (CraftBukkit/Spigot) b28d46114 Update scripts for NMS repackaging d4532f7e7 bug #5373 - fix AsyncChatEvent not being posted when processing a legacy APCE continuation 522ae1c51 Replace all block states of a specified block (#5055) 1cda67118 [Auto] Updated Upstream (CraftBukkit) 8c74d3126 Updated Upstream (Bukkit) (#5359) fd3c66a91 bug #5362 - correctly pass "render type" when registering a new scoreboard objective Tuinity Changes: 9bdcb9b Delete work dir when running jar 6351d7c Updated Upstream (Paper) 932c199 Generate mc-dev correctly bf3e737 Make packet limiter work from IDE 1686f38 Fix packet limiter config f40f7b4 Update README.md styling (#264) da1c3ac GH Actions Changes (#213) 5f325ec Updated Upstream (Paper) 0f83fe4 Updated Upstream (Paper) 44e8e5d Do not load extra radius of chunks when loading a single chunk 31f9cae Revert custom table implementation for blockstate states 9ac33d1 Be aware of entity teleports when chunk checking entities 18c7f3f Always set impulse for projectiles to true, even if hit event failed Airplane Changes: f94d399 Merge pull request #18 from notOM3GA/upstream/nms-repackage 0fc6226 Force build for Flare update 08439d6 Updated Upstream (Tuinity) 0f80443 Updated Upstream (Tuinity) 2f6cbdc More debug for plugins not shutting down tasks 12e1b61 Updated Upstream (Tuinity) fc778d3 Update README.md db6b0eb Merge pull request #16 from DeadSteve51/patch-2 b23bee3 Remove debug 8157e98 Config style, flare style, disable tracker by def 98d0b58 Updates to README Purpur Changes: 75b07a0 Fix stack overflow on armorstand movement f754a7b Sneak to bulk process composter 1362f49 Updated Upstream (Paper, Tuinity, & Airplane) 5bf8615 [ci-skip] Conflict on change for adventure deprecations 114b37b Add purpur.yml to Flare (#204) c6dce38 forgot the crops c004236 Configurable ravager griefable blocks list 766246a [ci-skip] remove duplicate patch ac93477 Config to make Creepers explode on death (#201) 297181e Updated Upstream (Paper, Tuinity, & Airplane) 45b9a18 Config to disable Llama caravans (#203) a99a83b Allow fully disabling farmland trampling 3aa4f68 Tick fluids config 0e34d59 Add missing imports :/ 3dd9f46 Updated Upstream (Paper, Tuinity, & Airplane) Empirecraft Changes: 1b579407 Improve importmcdev script and fix first server patch f597a82e Update generatesources script 218f5298 Fix patches - imported files 847cf558 Updated Paper d51410c3 Updated Paper fb3301fd Fix bow entity ai speed/distance dbde1dc4 Add isJoined boolean to fake players a23317f7 Update Fake Player API - misc changes a970b77f Updated Paper * Updated Upstream and Sidestream(s) (Paper/Airplane/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 7259c32ba [CI-SKIP] [Auto] Rebuild Patches 0e06e912e Fix annotations so Inventory#getContents returns non-null array with nullable type (#5350) b90b4f8ad Properly apply Sign#isEditable to TEs when calling BlockState#update Airplane Changes: 87d4a17 Track queue debug command Purpur Changes: d44f93e Fix tpsbar with naughty plugins * Updated Upstream and Sidestream(s) (Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Purpur Changes: 99f1ce6 Add enchantment target for bows and crossbows af9181e Add configurable drowning settings (closes #221) (#222) f72437b Remove mcdevimports.* (#228) 08de42d Add config for infinity on crossbows (#215) 5f76cb3 Add a config for villager trading (#210) 67ffa05 Add config for disabling skipping the night (#209) * revert paper commit that made the build fail (CI still doesn't work) * Update build.yml * test2 * Update build.yml * take7 * how often does md_5 change mappings? this will come back to bite me in exactly 17 days * Revert "how often does md_5 change mappings?" This reverts commit 8b05c16d6cce156c7d8b57f5071a700b979206ef. * Updated Upstream and Sidestream(s) (Paper/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 6caa330c6 Add checkerframework nullness annotations to accepted list for AnnotationTest (#5409) Purpur Changes: 96f5360 Config to allow for unsafe enchants (#235) b6235af Rebase on latest Purpur (#230) 754948e Updated Upstream (Paper) f55c0e9 Option to make doors require redstone (closes #171) 34d5818 Fix paper using wrong annotations f31bcc6 Updated Upstream (Paper & Airplane) 55244dd Config to show Armor Stand arms on spawn (#231) c726479 Config to disable hostile mob spawn on ice `:)` (closes #214) (#229) 26a0094 Break individual slabs when sneaking (closes #218) c3de3ac Fix wart farmers plating vegetables on soul sand * Updated Upstream and Sidestream(s) (Tuinity/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 1b0d783 Updated Upstream (Paper) 2c16629 Fix NPE in NetworkManager#execute Purpur Changes: 0d25d39 Add cache for slime max health (resolves #234) 39dd78a Fix #240 - Separate slab breaking triggers every single time 1ecb9ef Projectile offsets config (#237) 33ee1e7 Configurable sponge absorption (closes #232) (#236) a0355eb Add Note Block to disabled block updates (#241) * Updated Upstream and Sidestream(s) (Paper) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: 8b47131da Optimize short circuit evaluation of sign check (#5348) 1a2fd12a5 Drop carried item when player has disconnected (#5036) (#5166) 68af93524 Use PaperAdventure.PLAIN instead of PlainComponentSerializer.plain() for AdventureComponent#getString (#5414) * Updated Upstream and Sidestream(s) (Tuinity/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: 94f025a Updated Upstream (Paper) ab00f31 Do not load chunks around fake players a9599d8 Fix incorrect parsing of positive target-send-rate 2a6cd81 Make sure to remove correct TE during TE tick Purpur Changes: 9dfc780 Config for powered rail activation distance (#248) Co-authored-by: duplexsystem <duplexsys@protonmail.com>
2021-03-28 16:50:47 +02:00
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2021-06-03 04:37:38 +02:00
@@ -226,6 +226,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
DedicatedServer.LOGGER.error("Unable to load server configuration", e);
return false;
}
+ org.yatopiamc.yatopia.server.YatopiaConfig.registerCommands();
// Yatopia end
Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur) (FIRST 1.16.4) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: d7f2b6e Updated Upstream (Paper) 0850468 Properly ignite entities that stand in fire 4ff2d15 More cleanup to delay chunk unloads 52f4d08 Cleanup post dev branch merge f2eef4a Fixup dev branch patches and store reverted patches in revert folder 85aba13 Merge branch 'dev/some-opts' c3a9e41 Remove deprecated function usage in github actions (#200) dde7028 Merge branch 'master' into dev/some-opts 083e162 Updated Upstream (Paper) - Update to 1.16.4 576e2cc Rate limit incoming packets 7f251e0 Updated Upstream (Paper) 7d45836 Updated Upstream (Paper) cff9ec0 Updated Upstream (Paper) c3d5d24 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3 c12d582 Merge branch 'master' into dev/some-opts cbffdcc Do not mark entities in unloaded chunks as being in blocks 988e550 Updated Upstream (Paper) 84aecdb Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3 f7b8e25 Split dev branch 3200930 Merge branch 'master' into dev/some-opts 82e5dfb Updated Upstream (Paper) d41103d Updated Upstream (Paper) 1d73f6c Updated Upstream (Paper) 8ba1bab Updated Upstream (Paper) ac6b72e Updated Upstream (Paper) 8d982c4 Updated Upstream (Paper) 2c7bad9 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3 903f580 Merge remote-tracking branch 'origin/dev/some-opts' into dev/some-opts 0179ea8 Re-Add region manager and notify patch 6886867 Merge branch 'master' into dev/some-opts fb292c1 Updated Upstream (Paper) 442890b Fix decompression with Velocity natives (#191) 57fed71 Fix decompression with Velocity natives 102d60b Rebuild patches 968512b Add Velocity natives for encryption and compression (#188) e2dcdd1 Correct return value for ChunkCache#getCubes 4a99f3e Updated Upstream (Paper) f5d537e Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3 784b838 Some fixes be0b91f Merge branch 'master' into dev/some-opts 2cb36ca Optimise non-flush packet sending be68938 Hey git, may I know what happened here? 1cac0a2 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3 d72e062 Merge branch 'master' into dev/some-opts 76777f0 Updated Upstream (Paper) 6465aba Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3 d82174a Merge branch 'master' into dev/some-opts 460581d Fix getClosestEntity not working d39cda0 Updated Upstream (Paper) 2110847 Rewrite getClosestEntity 3e45700 Do not return complex parts for entity by class lookup c9cfdba Updated Upstream (Paper) 5994cb0 Updated Upstream (Paper) 7dfe18c Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3 363973d Merge branch 'master' into dev/some-opts 1c05858 Updated Upstream (Paper) adaafb4 Git merge doesn't update submodules ab71ded Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3 54db338 Merge branch 'master' into dev/some-opts 483289c Updated Upstream (Paper) e36359e Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2 ef8cd34 Fix NPE b770af9 Merge branch 'master' into dev/some-opts d479e12 Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.2 a1b90f8 Merge branch 'master' into dev/some-opts 30c5ca5 Merge branch 'master' into dev/some-opts e59b60b Updated Upstream (Paper) 09f62a7 Rebuild patches b041d11 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2 27fca2d Merge branch 'master' into dev/some-opts a218f5d Updated Upstream (Paper) f7c5428 Updated Upstream (Paper) a17dc2c Attempt to fix incorrect nearest village distance tracker updating 8830cef Remove streams for poi searching in some zombie pathfinding 89276ac Fix villagers aggressively looking at people db64f14 Make sure to despawn entities if they are outside the player general area range ba0bfda Updated Upstream (Paper) 200f825 Actually unload POI data 3dc7b9e Updated Upstream (Paper) 30f6ca0 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp 3b008f5 Optimisations c628aa4 Updated Upstream (Paper) 1ed41fc Updated Upstream (Paper) 193d9bf Updated Upstream (Paper) f2ac649 Updated Upstream (Paper) a63298f Upstream a12e1f6 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp 9eed723 Rebuild patches d03dbcc Updated paper c1002c5 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp 27084eb Updated paper bfb0ded Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp 763aa6c Updated Upstream (Paper) 49898d0 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp 199edf5 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp 78bfcfb Update everything bbbe82e change upstream EMC Changes: 4da58340 clear more entity tasks with reloads 2f3d567f Improve temp meta reloading efd7ea89 Updated Paper 25426b02 Updated Paper 35099319 Fix blockbreaknaturally event not always having the loc stored Purpur Changes: 306e9ac Add missing repos for deps 67be68c Updated Upstream (Tuinity) cf3e3e7 Fix last patch :3 a43bb36 Arrows should not reset despawn counter f0b8bd7 Updated Upstream (Paper) f15d3f0 Updated Upstream (Tuinity) 39ce110 Fix missed obf method rename in Tuinity patches bae5baa Updated Upstream (Paper) 5569d02 Updated Upstream (Paper) 72c4c5e Updated Upstream (Paper) 7fa8baf Update readme 03654a6 Update to 1.16.4 ^_^ 0fa478d Updated Upstream (Paper & Tuinity) 3fec5da Rebuild patches 2f7a0a0 Fix client lag on advancement loading 3f325b8 Fix #86 Move pathfinders into NMS package to satisfy Paper's AI API 7cfd3d7 Updated Upstream (Paper) cc6c167 Updated Upstream (Paper)
2020-11-07 08:02:33 +01:00
de.minebench.origami.OrigamiConfig.init((java.io.File) options.valueOf("origami-settings"));
this.setPVP(dedicatedserverproperties.pvp);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-06-10 22:13:42 +02:00
index 82d82e73cfab8689d9c87019d2992a3b770f150d..45953895cbf2c5059de8bd39e25e5a8d13bfdb60 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-06-10 22:13:42 +02:00
@@ -937,6 +937,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
+ org.yatopiamc.yatopia.server.YatopiaConfig.registerCommands(); // Yatopia
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
2021-06-10 22:13:42 +02:00
diff --git a/src/main/java/org/yatopiamc/yatopia/server/NSPTCommand.java b/src/main/java/org/yatopiamc/yatopia/server/NSPTCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..e6eaa07c57e04bbfba9e4aa8e0e939f85169d0c8
--- /dev/null
+++ b/src/main/java/org/yatopiamc/yatopia/server/NSPTCommand.java
@@ -0,0 +1,59 @@
+package org.yatopiamc.yatopia.server;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import net.minecraft.server.MinecraftServer;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+public class NSPTCommand extends Command {
+
+ public NSPTCommand(String name) {
+ super(name);
+ this.description = "View server tick times in nanoseconds";
+ this.usageMessage = "/nspt";
+ this.setPermission("bukkit.command.nspt");
+ }
+
+ @Override
+ public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+ if (!testPermission(sender)) return true;
+
+ MinecraftServer server = MinecraftServer.getServer();
+
+ List<String> times = new ArrayList<>();
+ times.addAll(eval(server.tickTimes5s.getTimes()));
+ times.addAll(eval(server.tickTimes10s.getTimes()));
+ times.addAll(eval(server.tickTimes60s.getTimes()));
+
+ sender.sendMessage("§6Server tick NS times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:");
+ sender.sendMessage(String.format("§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s", times.toArray()));
+ return true;
+ }
+
+ private static List<String> eval(long[] times) {
+ long min = Integer.MAX_VALUE;
+ long max = 0L;
+ long total = 0L;
+ for (long value : times) {
+ if (value > 0L && value < min) min = value;
+ if (value > max) max = value;
+ total += value;
+ }
+ double avgD = ((double) total / (double) times.length);
+ return Arrays.asList(getColor(avgD), getColor(min), getColor(max));
+ }
+
+ private static String getColor(double avg) {
+ return ChatColor.COLOR_CHAR + (avg >= 5E+7 ? "c" : avg >= (4E+7) ? "e" : "a") + avg;
+ }
+}
diff --git a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
2021-06-10 22:13:42 +02:00
index 50f232c956f68d3d9c3eaf645810e38d805f4531..bd6e45e256736bdf7b40b2a3fa3f371f601e3970 100644
--- a/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
+++ b/src/main/java/org/yatopiamc/yatopia/server/YatopiaConfig.java
@@ -6,11 +6,14 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.regex.Pattern;
import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
2021-06-10 22:13:42 +02:00
@@ -24,8 +27,14 @@ public class YatopiaConfig {
public static YamlConfiguration config;
public static int version; // since we're remapping sidestreams' configs we need this public
public static boolean verbose; // since we're remapping sidestreams' configs we need this public
+ private static Map<String, Command> commands;
/*========================================================================*/
2021-06-10 22:13:42 +02:00
+ static {
+ commands = new HashMap<>();
+ commands.put("nspt", new NSPTCommand("nspt"));
2021-06-10 22:13:42 +02:00
+ }
+
public static void init(File configFile) {
CONFIG_FILE = configFile;
config = new YamlConfiguration();
@@ -46,6 +55,12 @@ public class YatopiaConfig {
readConfig(YatopiaConfig.class, null);
}
+ public static void registerCommands() {
+ for (Map.Entry<String, Command> entry : commands.entrySet()) {
+ net.minecraft.server.MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Yatopia", entry.getValue());
+ }
+ }
+
private static void removeLeftovers() {
// this method is only to remove non-used values in the config