Commit Graph

7807 Commits

Author SHA1 Message Date
RedDevel2
41608fa1d3 Merge pull request #6 from Protonull/remove-item-makers
Remove unused item-maker classes
2024-02-19 21:56:15 +01:00
RedDevel2
e8e8319f8e Merge pull request #8 from CivMC/holder-no-snapshot
Don't use snapshots with getHolder
2024-02-19 21:56:05 +01:00
RedDevel2
5419efdff6 Merge pull request #1 from CivMC/namelayer-gui-improvements
Make the /nl GUI easier to use
2024-02-19 16:45:04 +01:00
RedDevel2
93ab05b9c0 Merge pull request #9 from CivMC/name-layer-special-lag
Fix lag when loading the Name_layer_special group
2024-02-19 16:44:56 +01:00
MrJeremyFisher
34b4c2af1e Add a command to view the intro book 2024-02-18 20:41:54 -05:00
MrJeremyFisher
58570ae48d Make /janame feedback a bit nicer 2024-02-18 17:30:46 -05:00
AngrySoundTech
afd9864282 Relocate JukeAlert 2024-02-18 14:27:03 -05:00
AngrySoundTech
e9a1479454 Merge remote-tracking branch 'ja/master' 2024-02-18 14:20:36 -05:00
AngrySoundTech
36ba97771e Relocate RealisticBiomes 2024-02-18 14:19:11 -05:00
AngrySoundTech
66893341ba Merge remote-tracking branch 'rb/master' 2024-02-18 14:13:52 -05:00
okx-code
553404218c Sort group names by rank as well 2024-02-18 14:46:30 +00:00
okx-code
ceabf06797 fix typo 2024-02-17 21:03:56 +00:00
okx-code
8367446f15 Add a fix for high despawn ranges
At high despawn ranges, mobs might not have the chance to despawn before they are unloaded. This fix forcibly despawns the mob when it is unloaded.
2024-02-17 21:02:02 +00:00
okx-code
7fe72c1bb7 Fix lag when loading the Name_layer_special group
When a group is deleted, it is "merged" into the Name_layer_special group by adding a redirection from the original group's ID to Name_layer_special's ID in the faction_id table.

Then, it deletes all members of the group. However, that breaks this statement which is an INNER JOIN, and only returns a row if there is a row in both tables.

Since the deleted group does not have any members, this query will not return the deleted group's ID, and that ID will not be associated with this group.

This caused a problem, because the deleted group's ID is still associated with all the reinforcements with that group. Whenever the group of a reinforcement is looked up, it will find the Name_layer_special group through the faction_id table's association. However, the lookup will not be cached, because the cache key is based on any IDs associated with the resultant group, and in this case, it does not include the deleted group's ID.

Therefore, with no caching, a database lookup will occur every time the group is needed, which will be performed on the main thread and can occur several times during, for instance, a single /cti or block break.

The fix involves using LEFT JOIN instead of INNER JOIN, so that the deleted group will still be returned even though it does not have any members.
2024-02-17 04:07:45 +00:00
okx-code
f525b7afeb Don't use snapshots with getHolder
This uses 0.5%-1% of a tick by copying loads of data around that we never use, this uses the new getHolder(boolean) method added by https://github.com/PaperMC/Paper/pull/3535, which is much faster.
2024-02-17 03:05:41 +00:00
Alexander
8f2a542055 Remove unused SkinCache
This is a relic of when the util package was moved to utilities, but nothing refers to it.
2024-02-17 02:21:09 +00:00
Alexander
1f9726380a Remove unused item-maker classes 2024-02-17 02:18:23 +00:00
Alexander
424a014bef Fix and optimise ACF extensions 2024-02-17 02:12:32 +00:00
Alexander
63dd5a0d26 Remove asTranslatable
Save for the PotionUtils class where some custom translation-finding stuff is, these methods can be entirely fobbed off to Kyori.
2024-02-17 01:51:15 +00:00
okx-code
9796b2c4c9 Make the /nl GUI easier to use
- Sort all groups by their names
- Sort members of groups by their rank, and then their name
- Show /nlpp and /nlrm command hints (most people don't seem to be aware of these commands)
2024-02-17 01:03:16 +00:00
AngrySoundTech
9385a243b1 Update plugin names 2024-02-16 15:01:09 -05:00
AngrySoundTech
b140bae01c Relocate simpleadminhacks 2024-02-16 14:50:11 -05:00
AngrySoundTech
f4b171a16a Relocate randomspawn 2024-02-16 14:43:05 -05:00
AngrySoundTech
cafc8f04b5 Merge remote-tracking branch 'ep/master' 2024-02-16 14:29:22 -05:00
AngrySoundTech
e54799aed4 Relocate randomspawn 2024-02-16 14:27:49 -05:00
AngrySoundTech
bd745edabc Merge remote-tracking branch 'rs/master' 2024-02-16 14:19:02 -05:00
AngrySoundTech
3206238b81 Relocate civchat2 2024-02-16 14:17:50 -05:00
AngrySoundTech
42c012b089 Merge remote-tracking branch 'cc2/master' 2024-02-16 13:58:51 -05:00
AngrySoundTech
eb7ddd8387 Relocate bastion 2024-02-16 13:58:48 -05:00
AngrySoundTech
753ac8122b Merge remote-tracking branch 'bastion/master' 2024-02-16 13:34:46 -05:00
AngrySoundTech
d06a904af6 Relocate banstick 2024-02-16 13:32:24 -05:00
AngrySoundTech
872ac0bd87 Merge remote-tracking branch 'bs/master' 2024-02-16 13:21:36 -05:00
AngrySoundTech
f07605b281 Relocate combatagplus 2024-02-16 13:21:31 -05:00
AngrySoundTech
03787420c5 Merge remote-tracking branch 'ctp/master' 2024-02-16 13:05:15 -05:00
AngrySoundTech
17d0e31931 Relocate citadel 2024-02-16 12:51:03 -05:00
AngrySoundTech
625081db33 Merge remote-tracking branch 'citadel/master' 2024-02-16 12:42:04 -05:00
AngrySoundTech
1e44e6c642 Fix exported api deps 2024-02-16 12:37:06 -05:00
AngrySoundTech
b28d6b2970 Relocate Namelayer 2024-02-16 12:30:56 -05:00
AngrySoundTech
217967e771 Merge remote-tracking branch 'nl/master' 2024-02-16 12:24:14 -05:00
AngrySoundTech
1cfe65e65d Merge remote-tracking branch 'sah/master' 2024-02-16 12:20:32 -05:00
AngrySoundTech
0c030341d2 Share common group 2024-02-16 11:03:37 -05:00
AngrySoundTech
5667da69dc Remove CMC gradle.properties 2024-02-16 10:14:54 -05:00
AngrySoundTech
a8ee8a3873 Relocate CivModCore and integrate build 2024-02-12 15:26:04 -05:00
AngrySoundTech
f76bd14fa2 Merge remote-tracking branch 'civmodcore/master' 2024-02-12 14:27:19 -05:00
AngrySoundTech
ea2334eaa4 Orinnari feedback: Consolidate scripts into main buildscript 2024-02-12 14:23:20 -05:00
AngrySoundTech
e5f376125b Rearrange CivSpy 2024-02-07 20:14:37 -05:00
AngrySoundTech
b954687255 CivGradle port 2024-01-30 14:09:23 -05:00
AngrySoundTech
f9ac5c19cb Create workflow 2024-01-30 12:11:14 -05:00
Alexander
79b86e89da Remove Lombok :( 2023-12-18 17:52:53 +00:00
AngrySoundTech
c80378b38f Bump version and update civgradle 2023-12-16 14:40:32 -05:00