Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-22 02:25:57 +01:00
Code Issues Projects Releases Wiki Activity
3,386 Commits 6 Branches 0 Tags 106 MiB
7f400dc672
Commit Graph

3386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
385b9691d5 Merge 2024-10-29 20:37:25 +08:00
fullwall
8878c238c0 Add back compat for attribute 2024-10-29 20:35:25 +08:00
ZX夏夜之风
05ebf99d37
fix: sync with latest API change (#3169) 2024-10-29 19:57:35 +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
158d4d328c Fix entitytype lookup for old minecraft versions 2024-10-27 18:51:31 +08:00
fullwall
172976e3d6 Use Spigot libraries feature instead of libby 2024-10-24 02:15:53 +08:00
fullwall
f689152ef8 Merge branch 'master' of github.com:CitizensDev/Citizens2 2024-10-24 01:42:18 +08:00
fullwall
ff2cecf6f2 Initial update to 1.21.2 2024-10-24 01:42:07 +08:00
ZX夏夜之风
767a73a479
fix: we should cancel the original target event instead of our own version (#3163) 2024-10-23 23:45:01 +08:00
ZX夏夜之风
4d1b5a79b7
fix: release interaction NPC handle when owner NPC despawn (#3161) 2024-10-22 19:19:26 +08:00
ZX夏夜之风
5e85b8a035
fix: logging is not necessary even if ServerPlayer.mobCounts field is not found (#3162) 
* fix: logging is not necessary even if ServerPlayer.mobCounts field is not found

That field is Paper-specific thing, so it would not exist on Spigot, which will cause confusing error message.

* chore: add comment on Player.mobCounts MH fields
 2024-10-22 19:19:13 +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
2247a81150 Add setSpeed calls to fix armorstand not working with movecontrol 2024-10-19 20:01:27 +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
8f7ae65d93 Standardise SPECTRAL_ARROW treatment and add missing Minecart type 2024-10-02 17:08:31 +08:00
ZX夏夜之风
0e0e91e106
fix: remove duplicate and wrong entity controller definition for TippedArrow (#3155) 2024-10-02 17:00:17 +08:00
ZX夏夜之风
ebe00ae5c6
fix: remove other duplicate entity controller for POTION in other NMS modules (#3154) 
This appends to #3153
 2024-09-30 19:33:37 +08:00
fullwall
3a3f2cb9ea Try checking for entity spawned in sit trait 2024-09-29 22:56:05 +08:00
ZX夏夜之风
75ee655487
fix: remove duplicate entity controller definition for POTION in 1.21 (#3153) 2024-09-29 17:27:14 +08:00
fullwall
97960fcd48 Add missing method 2024-09-29 17:18:36 +08:00
fullwall
2ba1a1580d Restructure code for cleanliness 2024-09-29 16:22:16 +08:00
fullwall
59534df8c0 Set step height attribute on spawn centrally instead of locally 2024-09-29 16:18:09 +08:00
fullwall
e78499f6ca Extra null check in sit trait 2024-09-27 23:06:33 +08:00
fullwall
0f701a3c40 Missed 1.21 change 2024-09-24 22:22:12 +08:00
fullwall
8c4cf4a4b4 Use new boolean 2024-09-24 20:02:19 +08:00
fullwall
7935dd2ab6 Make /npc mount use mount trait 2024-09-22 00:14:11 +08:00
fullwall
905dff7eec Nuke the custom tag as well 2024-09-17 23:52:02 +08:00
fullwall
00eef79dc9 Extra sanity checks in shop trait 2024-09-17 02:19:31 +08:00
fullwall
7f9b4c629c Edit Minecraft trade selection clearing again 2024-09-16 19:06:58 +08:00
fullwall
15d31aa357 Edit itemstack parsing to pass the whole string to modifyItemStack since implementation has changed recently 2024-09-16 01:40:17 +08:00