Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-03 06:57:41 +01:00
Code Issues Projects Releases Wiki Activity
3,421 Commits 6 Branches 0 Tags 108 MiB
e393764880
Commit Graph

1467 Commits

Author SHA1 Message Date
fullwall
e393764880 Use new metadata and parse components per line in shop trait description 2024-12-19 21:48:07 +08:00
fullwall
a675406eae Use /npc item for minecarts, and add /npc hologram textshadow 2024-12-17 01:08:30 +08:00
fullwall
8d492ff0b2 Use parseItemstack 2024-12-16 23:13:37 +08:00
fullwall
ce41609139 Attempt to fix #3196 2024-12-16 04:00:52 +08:00
fullwall
e1d701050b Rework attribute fix 2024-12-16 03:23:20 +08:00
ZX夏夜之风
0239d5c8de
fix: attribute issues (#3193) 
* fix: NPEs from attribute related stuff

* chore: clarify comment

* fix: issues when using attribute key as argument

Changes:
Added argument parsing backward compatibility for /npc attribute command but also introduces more time cost (although it might be not so long, so we can assume it as zero)
Make OptionalAttributeCompletions return attribute keys for now as old enum names are too legacy.

* fix: rewrite attribute trait load logic
 2024-12-16 03:12:15 +08:00
fullwall
329275ea0a Remove debug for same-tick player entity de and re registration 2024-12-13 00:57:46 +08:00
fullwall
d8cc7b6f94 Simplify noDamageTicks 2024-12-10 18:51:51 +08:00
fullwall
baa629a1e0 Update to 1.21.4 2024-12-04 21:41:23 +08:00
fullwall
3f80ad1cd9 Adjust API usage 2024-12-03 21:37:27 +08:00
ZX夏夜之风
cc17c48df3
fix: hologram issues (#3195) 
* fix: force hologram entity names to be updated

* fix: possibly NPE

* fix: delay placeholder computing
 2024-12-03 21:33:31 +08:00
fullwall
d068180179 Delay hologram replacement 2024-11-30 13:53:00 +08:00
fullwall
f8cc30d7f2 Use speedModifier in a few more places 2024-11-28 19:44:16 +08:00
fullwall
2773304f47 Misc bugfixes 2024-11-28 19:37:49 +08:00
fullwall
8b4a4dd48c Don't compute a global npc shop if absent 2024-11-19 05:26:24 +08:00
fullwall
cd98ed3539 Split speech bubble text into newlines 2024-11-19 03:34:55 +08:00
fullwall
817df76468 Trial treating 403 Forbidden as too many requests 2024-11-10 07:51:12 +08:00
ZX夏夜之风
7cc2b0658d
fix: search attributes using different key for backwards compatibility (#3178) 2024-11-06 00:13:41 +08:00
ZX夏夜之风
601068c117
feat: NPC move event (#3172) 2024-11-05 22:53:37 +08:00
fullwall
52556f560e Use new API 2024-11-02 22:58:23 +08:00
fullwall
b7842183f8 Delay scoreboard creation slightly 2024-11-02 15:52:34 +08:00
fullwall
f31d986c27 Update for API changes, add /npc scaledmaxhealth, use new API 2024-11-02 13:50:19 +08:00
fullwall
7f400dc672 Cleanup 2024-11-01 23:36:08 +08:00
ZX夏夜之风
5c5cf51b3e
feat: targetable trait (#3173) 2024-11-01 23:27:04 +08:00
fullwall
69acf89ff9 Cleanup, return the navigation destination from NMS.getDestination in case external plugins miss the timing to get it 2024-11-01 20:27:16 +08:00
ZX夏夜之风
81d54bba57
fix: stop mobs from targeting NPCs when they are no longer targetable (#3171) 2024-10-31 22:08:39 +08:00
fullwall
c1def34749 Use BLOCK_MARKER instead of BLOCK for 1.19 compat 2024-10-29 23:09:45 +08:00
fullwall
8878c238c0 Add back compat for attribute 2024-10-29 20:35:25 +08:00
fullwall
1579aa0e9e Updated controllable for 1.21.3 2024-10-28 19:57:36 +08:00
fullwall
0b978f6322 Support blank cosmetic 2024-10-28 01:19:30 +08:00
fullwall
72dabc2c2d Incorrect pom change 2024-10-27 21:28:24 +08:00
fullwall
8111ba387f Add cosmetic equipper implemented using protocollib, currently doesn't refresh equipment manually 2024-10-27 21:27:27 +08:00
fullwall
4cf042eb3f Add /npc pausepathfinding --lockout, fix /npc text speech bubbles duration 2024-10-27 20:14:43 +08:00
fullwall
172976e3d6 Use Spigot libraries feature instead of libby 2024-10-24 02:15:53 +08:00
fullwall
ff2cecf6f2 Initial update to 1.21.2 2024-10-24 01:42:07 +08:00
ZX夏夜之风
4d1b5a79b7
fix: release interaction NPC handle when owner NPC despawn (#3161) 2024-10-22 19:19:26 +08:00
fullwall
708bf13afd Trial removing Player NPCs from the paper per-player mob limits 2024-10-20 17:09:19 +08:00
fullwall
ec4ba73ada Teleport interaction entity for boundingbox 2024-10-19 21:59:36 +08:00
fullwall
deb438bd75 Add NMS#getCollisionBox(BlockData) 2024-10-19 21:06:10 +08:00
fullwall
78f7ee15a4 Update chinese translation thanks to SNWCreations 2024-10-17 22:37:29 +08:00
fullwall
bf845289c2 Add duration argument to /npc command permission 2024-10-17 22:35:54 +08:00
fullwall
46f3c31832 Make areaeffectcloud the default hologram renderer over armorstand, add /npc areaeffectcloud 2024-10-13 01:07:28 +08:00
ZX夏夜之风
a7078b2c6d
fix(security): prevent temporary OP from being saved (#3159) 
* fix(security): prevent temporary OP from being saved

* fix: Player#setOp usage is not necessary

* fix: fixed incorrect implementation of setOpWithoutSaving for certain MC version
 2024-10-09 20:44:09 +08:00
ZX夏夜之风
f8107a8f8b
fix: NPC.isProtected() should be passed to the combust event (#3158) 2024-10-06 23:27:12 +08:00
fullwall
16b8407ebf Update simplified chinese translation thanks to @SNWCreations 2024-10-06 23:26:40 +08:00
fullwall
e9412b8159 Trial adding interactions to entity hitbox 2024-10-05 18:53:34 +08:00
fullwall
89331998a0 Merge branch 'master' of github.com:CitizensDev/Citizens2 2024-10-05 17:07:43 +08:00
fullwall
0e62308ba0 Change /npc size to /npc slimesize, centralise item pickup check to EventListen, add /npc textdisplay 2024-10-05 17:07:34 +08:00
ZX夏夜之风
22d2b1620d
fix: EventListen changes (#3156) 
* fix: EntityTargetNPCEvent should be able to be cancelled

* fix: rewrite logic of this PR

* fix: follow PR review

* fix: cancellable property of some events was ignored
 2024-10-05 16:38:55 +08:00
fullwall
3a3f2cb9ea Try checking for entity spawned in sit trait 2024-09-29 22:56:05 +08:00