Commit Graph

7937 Commits

Author SHA1 Message Date
okx-code
484f59d4a2 Merge main 2024-05-09 00:52:02 +01:00
okx-code
642574265e Revert "Merge pull request #394 from MrJeremyFisher/maybe-fix-factory-overflow"
This reverts commit 504317513e, reversing
changes made to c9bcc3c3c2.
2024-05-09 00:46:29 +01:00
RedDevel2
5f63cec70e Merge pull request #350 from MrJeremyFisher/nllim
Add `/nllim` (Name Layer List Invited Members)
2024-05-01 23:16:25 +02:00
RedDevel2
a7815e5b7b Merge pull request #347 from MrJeremyFisher/pot-glitch-fix
Don't heal dead entities with health potions
2024-05-01 23:16:17 +02:00
RedDevel2
6b6fa21d8d Merge pull request #383 from drekamor/main
Proper /nldg confirmation
2024-05-01 23:15:55 +02:00
RedDevel2
85fc356749 Merge pull request #386 from CivMC/fix-portals
Fix portal hack not triggering
2024-05-01 23:15:28 +02:00
RedDevel2
4d8bfeea4a Merge pull request #391 from CivMC/fix-chunk-meta
Fix chunk meta not saving
2024-05-01 23:15:18 +02:00
RedDevel2
5472b41937 Merge pull request #404 from Protonull/ignorelist-command
Refactor /ignorelist command
2024-05-01 23:15:09 +02:00
RedDevel2
504317513e Merge pull request #394 from MrJeremyFisher/maybe-fix-factory-overflow
Fix Factory Overflow
2024-05-01 23:15:01 +02:00
okx-code
8de69af7a0 Update AntiDerailment NMS 2024-04-23 20:48:12 +01:00
okx-code
79edc91825 Update FakePlayer 2024-04-23 20:46:29 +01:00
okx-code
f83f7bb0c0 Merge branch 'main' into mc/1.20
# Conflicts:
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/BlockListener.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/SaplingHack.java
2024-04-23 20:31:08 +01:00
drekamor
b56931ec85 Merge branch 'CivMC:main' into main 2024-04-17 17:44:24 +01:00
Alexander
695a0f426a Refactor /ignorelist command 2024-04-16 06:54:46 +01:00
Alexander
b0323123e6 Yeet canvas 2024-04-05 00:06:57 +01:00
MrJeremyFisher
0bcef3a2f4 Requested changes 2024-04-01 15:17:54 -04:00
MrJeremyFisher
dc156c21ff Fix incorrect fullness checks 2024-04-01 14:55:10 -04:00
okx-code
26e5acb93b Fix chunk meta 2024-03-26 15:38:14 +00:00
okx-code
9375bb2979 ertyeghzsehyen edgz 2024-03-26 01:35:57 +00:00
okx-code
a1c906a43c bump versions 2024-03-25 21:31:45 +00:00
okx-code
300fee3771 Merge pull request #387 from CivMC/meta-log
Add logging for ChunkMeta
2024-03-25 21:30:19 +00:00
okx-code
42c9829153 add world 2024-03-25 21:30:05 +00:00
okx-code
bd37d9a375 Fix logs 2024-03-25 21:27:08 +00:00
okx-code
ace42ef2c8 fix messages 2024-03-23 20:36:59 +00:00
okx-code
a57ab8e417 address review 2024-03-23 20:35:22 +00:00
okx-code
5546d812bb Merge pull request #385 from CivMC/hash-set
Replace HashSet with OpenObjectHashSet
2024-03-23 20:20:16 +00:00
okx-code
3e36e65a8a fix prefix 2024-03-23 15:57:31 +00:00
okx-code
8c8e1cdab5 delay teleport 2024-03-23 01:59:33 +00:00
okx-code
f73589fdb4 Fix portal hack not triggering
If you are falling really fast, you will be falling multiple blocks per second, and could possibly pass straight through an end portal. This fix changes the hack to use an event triggered earlier to detect if a player passes through an end portal.
2024-03-23 01:42:38 +00:00
okx-code
7e7b35a371 add logging 2024-03-23 01:09:07 +00:00
drekamor
e8cc18a447 Add quotes 2024-03-22 22:00:04 +00:00
okx-code
66727b4663 Replace HashSet with OpenObjectHashSet
A quick fix for the large memory usage of this object, HashSet uses an empty object as a value of each element in its set, but OpenObjectHashSet doesn't rely on HashMap, has no keys, and is therefore more memory efficient.
2024-03-22 20:21:57 +00:00
okx-code
138c939684 Fix NPE in CivChat
Due to the new changes with the scoreboard where it now updated when you log in, it might try and show you as messaging a player who is offline. This change will no longer show you as messaging players who are offline and will also automatically disable messaging them.
2024-03-22 18:52:24 +00:00
drekamor
37daa50a24 Remove underscores 2024-03-22 17:16:38 +00:00
drekamor
e5357dc492 Remove unused imports 2024-03-22 00:23:43 +00:00
drekamor
d9eb92efe2 Small fixes 2024-03-22 00:20:06 +00:00
drekamor
5fd0cdd6ad Allow lower case 2024-03-22 00:15:08 +00:00
drekamor
93c164af8c Use text components 2024-03-22 00:12:36 +00:00
drekamor
2020b65a76 Foolproof 2024-03-21 23:58:11 +00:00
drekamor
5230fed55f remove space in confirm string 2024-03-21 23:36:55 +00:00
drekamor
180198d4ce Proper /nldg confirmation 2024-03-21 23:34:30 +00:00
okx-code
543d5e3560 Bump versions 2024-03-21 19:04:52 +00:00
MrJeremyFisher
84f0ff22f6 Fix factories not stopping when full (maybe) 2024-03-21 10:51:04 -04:00
okx-code
23e486561b Merge pull request #376 from CivMC/interact-fix
Allow interacting with chests and trapdoors if doing so would not actually open them
2024-03-21 00:28:55 +00:00
okx-code
1ca93562a9 Merge pull request #374 from CivMC/fix-anchor-bombing
Prevent respawn anchors being used as anti-place
2024-03-21 00:28:48 +00:00
okx-code
a1ea583515 Merge pull request #349 from MrJeremyFisher/ignore-login-logout
Ignore logins and logouts with `/ignore`
2024-03-19 23:04:57 +00:00
okx-code
07aa172b28 Merge pull request #339 from Protonull/player-name-cache
Create centralised player-name cache
2024-03-19 22:58:27 +00:00
okx-code
d3f2a97bfb Merge pull request #351 from MrJeremyFisher/no-reinforced-grass-spread
Prevent grass spread to reinforced dirt
2024-03-19 22:55:35 +00:00
okx-code
51594efc9b cleanup code 2024-03-19 22:53:31 +00:00
okx-code
a69999d58a remove environment reference 2024-03-19 22:35:24 +00:00