Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-22 12:29:59 +02:00
Code Issues Projects Releases Wiki Activity
3,363 Commits 6 Branches 0 Tags 103 MiB
2247a81150
Commit Graph

3363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fullwall
17eeac29cf Add warning for meta filter user logic error 2024-09-16 01:20:25 +08:00
fullwall
3c3a8102d6 Allow players to click on their inventory during trader view 2024-09-15 18:52:14 +08:00
fullwall
c87193b3fd Add optional minecraft namespace to item hologram regex 2024-09-15 00:57:05 +08:00
fullwall
826008dac6 Fix infinite loop in last ocmmit 2024-09-09 19:47:48 +08:00
fullwall
d4fba3b549 Trial clearing component predicates for merchant offers in 1.20.6+ 2024-09-09 19:35:05 +08:00
fullwall
fa4ea79606 Set hover in place to true for parrot npcs 2024-09-09 17:05:45 +08:00
fullwall
5d1a1ad642 Make meta comparison ignore ingredients that don't match the meta instead of rejecting the transaction 2024-09-09 02:22:34 +08:00
fullwall
b26f185de2 Trial clearing meta if compare similarity set to false in trading inventory. This is to use Citizens logic instead of Minecraft logic for trade selection 2024-09-09 02:09:13 +08:00
fullwall
91e4fb10fc Remove debug 2024-09-09 01:42:39 +08:00
fullwall
a87756616d Make meta filter more strict, move custom -> custom_data to match NBT 2024-09-09 01:26:27 +08:00
fullwall
1ab4bfe177 Add open shop action to shops 2024-09-09 00:26:52 +08:00
fullwall
d0ff1d147e Add custom tag parsing to shop, add /npc hologram insert, add /npc text send text to chat toggle 2024-09-08 19:41:53 +08:00
fullwall
81794f5ece Remove NMS#getNPC and NMS#getMethod, fix Fox setFaceplanted mapping 2024-09-05 23:57:54 +08:00
fullwall
7cabe94b14 Null check for bad economy plugins 2024-09-05 23:40:10 +08:00
fullwall
8a53ac68f8 Log some errors in MoneyAction if they occur 2024-09-05 23:38:52 +08:00
fullwall
4b00b48c21 Make NMS more consistent and reduce static field usage 2024-09-05 23:25:14 +08:00
fullwall
d4501cc372 Fix skin placeholder respawning too much 2024-09-04 08:50:16 +08:00
fullwall
b6234fcd24 Fix migrate path for pathfinding debug 2024-09-03 22:59:05 +08:00
fullwall
ffea6bd2f4 Add /npc command -n 2024-09-03 22:57:52 +08:00
fullwall
f0105a578f Simplify skin.applyAndRespawn slightly 2024-09-02 23:34:23 +08:00
fullwall
bbd45127b2 Improve advancement performance by stubbing the SAM, don't initialise on every call 2024-09-01 23:29:26 +08:00
fullwall
34126ccd8f Trial removing setPos for perf benefits 2024-09-01 13:17:12 +08:00
fullwall
045054c076 Trial calling super#stopListening() in player advancements 2024-09-01 11:50:32 +08:00