Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-30 06:33:56 +01:00
Code Issues Projects Releases Wiki Activity
2,152 Commits 6 Branches 0 Tags 106 MiB
2f6395884a
Commit Graph

447 Commits

Author SHA1 Message Date
fullwall
a535cea8bc Pretty print location in /npc moveto 2020-03-31 21:44:04 +08:00
fullwall
8779062a82 Initialise location cache 2020-03-28 01:51:53 +08:00
fullwall
4cc3c40c87 SpawnReason.COMMAND should try to load the destination spawn location 2020-03-28 01:20:20 +08:00
fullwall
947f4301f3 Set head yaw when teleporting NPCs 2020-03-28 01:14:11 +08:00
fullwall
f0000cdf3b Allow placeholder API in /npc create, fix float persistence bug 2020-03-27 18:50:14 +08:00
fullwall
773058fa22 Add method to wander provider to set XY range properly 2020-03-22 11:51:32 +08:00
fullwall
1cd8e1913e Add head yaw persistence 2020-03-21 18:30:52 +08:00
fullwall
1e507a1d57 Use old logic for glowing colour in 1.12, remove unnecessary respawn in /npc rename for non-Player NPCs 2020-03-21 15:19:46 +08:00
fullwall
5f6026f50b Add --url parameter to /npc skin 2020-03-20 17:29:23 +08:00
fullwall
1ddc78a543 Restore old stuck behaviour 2020-03-16 20:28:41 +08:00
fullwall
46b1ba6e98 Use strings instead of UUID keys 2020-03-07 12:43:16 +08:00
fullwall
f345ef3f16 Restore PR, add --n to /npc command to allow a maximum number of uses per command 2020-03-03 23:40:42 +08:00
fullwall
9f3841c3ec Fix /npc name in 1.8.8 2020-03-03 23:31:04 +08:00
fullwall
188c65f203 Add --permissions to /npc command 2020-03-02 23:40:13 +08:00
fullwall
496a4cbb3b Use Minecraft's no gravity logic and enable it for all default flying NPCs 2020-03-02 14:51:54 +08:00
fullwall
87c2a884c5 Merge branch 'master' of github.com:CitizensDev/Citizens2 2020-03-01 15:30:00 +08:00
fullwall
95ab688877 Fix shulker color setting 2020-03-01 15:29:47 +08:00
fullwall
ad69b483db Add /npc snowman 2020-02-25 14:12:06 +08:00
fullwall
a8676cd739 Add a new look close setting to control enabling while pathfinding 2020-02-25 13:43:19 +08:00
fullwall
225ede02ce Don't use teleport for flying navigation 2020-02-23 11:08:51 +08:00
fullwall
efc41dc492 Add cooldown option to /npc command 2020-02-22 12:57:03 +08:00
fullwall
0e043843e4 Adjust NPC_NAME_TOO_LONG message 2020-02-21 23:52:53 +08:00
fullwall
de94185133 Fix turtle navigation between biomes 2020-02-21 23:50:35 +08:00
fullwall
e52f616a4b Added sitting flag to /npc panda 2020-02-21 20:28:57 +08:00
fullwall
fca5dc21e0 Make bee always flyable 2020-02-21 17:40:27 +08:00
fullwall
b9a08d609a Reformat project 2020-02-14 22:48:40 +08:00
fullwall
ade25b246a Use Minecraft horse controls 2020-02-14 22:42:03 +08:00
fullwall
3bf5881c4b Fix /npc equip for horses on 1.15, add max controllable speed setting 2020-02-14 19:00:06 +08:00
fullwall
72180ff8ee Update pom 2020-01-22 21:44:12 +09:00
apachezy
577b1fcedd Added Simplified Chinese language translation file. (#2028) 
* Removed duplicate permissions key in plugin.yml

* Added Simplified Chinese language translation file.
 2020-01-19 20:13:16 +09:00
fullwall
c42d5f7aa0 Catch /npc command exceptions 2020-01-17 18:15:21 +09:00
fullwall
36ff6730fd Allow both hands in /npc command 2020-01-17 18:11:23 +09:00
fullwall
89874092ed Use PlaceholderAPI for /npc command 2020-01-16 20:40:32 +09:00
fullwall
529855bd6d Deregister event handlers in deregisterAll(), empty talk item is now equivalent to * talk item 2020-01-16 17:17:58 +09:00
fullwall
cd21b9fb8a Increase max controllable speed 2020-01-12 21:08:29 +09:00
fullwall
41f4c6e1b4 Properly remove wander waypoint marker 2020-01-12 00:33:43 +09:00
fullwall
a0e3b23bc3 Try to migrate ocelot modifiers trait for new MC versions 2020-01-11 13:41:46 +09:00
fullwall
52e288e43f Add -o option to /npc command 2019-12-29 22:14:38 +09:00
fullwall
ab4060964c Add isPowered method 2019-12-24 00:39:27 +09:00
fullwall
1a0282d970 Fix /npc metadata remove and forward getOptional call to avoid default entity type issue 2019-12-23 11:03:08 +09:00
fullwall
5972e3dffc Make LinearWaypointProvider more null safe 2019-12-21 20:25:38 +09:00
fullwall
3186f6de5e Change waypoints to onAttach 2019-12-21 19:09:50 +09:00
fullwall
ba61a48815 Bump pom versions 2019-12-21 18:56:28 +09:00
fullwall
8c165b9d55 Warn on missing delay in text prompt 2019-12-19 16:46:26 +09:00
fullwall
64aa09bc94 Incorrect javadoc version 2019-12-12 00:20:31 +08:00
fullwall
688f78ea6f Merge moduled trait code and discontinue building of 1.10 2019-12-12 00:13:54 +08:00
fullwall
ff9c920df3 Initial 1.15 support 2019-12-11 11:25:10 +08:00
fullwall
0a748c7825 Load /npc spawn --at chunk 2019-12-03 19:01:29 +08:00
fullwall
7715232bb3 Add missing p flag to the annotation 2019-12-02 11:28:34 +08:00
fullwall
0d558c8ee1 Add -p flag to /npc command to run as the clicking player 2019-12-02 11:27:15 +08:00
fullwall
798c82536c Fix bug in tpto 2019-11-28 16:14:29 +08:00
fullwall
d0dcb235b3 Various fixes and features 2019-11-28 16:10:35 +08:00
fullwall
94733ddb81
Update NPCCommands.java 2019-11-18 23:55:11 +08:00
fullwall
727d1508e9 Implement new command method 2019-11-12 15:17:54 +08:00
fullwall
174ec609ca Convert to iterator loop 2019-10-20 09:52:07 +08:00
fullwall
771281ef89 Allow tpto to work with 2 arguments 2019-10-19 13:42:37 +08:00
fullwall
63a88acf81 Fix distance calculations for new pathfinder 2019-10-17 18:04:20 +08:00
fullwall
72002e96fa Don't fall through 2019-10-17 17:38:57 +08:00
fullwall
d7e1110d46 Normalise distance margin calculations across implementations and loosen up the y distance restriction 2019-10-16 18:04:55 +08:00
fullwall
d64876dd65 Temp test fix for spawning 2019-10-03 21:33:06 +08:00
fullwall
d72b6ef9e8 Change isSpawned API to use old valid logic. May fix spawning issues. 2019-10-03 13:14:20 +08:00
fullwall
95e9aa1389 Fix new command trait persistence 2019-10-01 14:16:00 +08:00
fullwall
dabe4bb43e Add error colour setting, don't over-paginate for console commands 2019-09-24 22:05:10 +08:00
fullwall
03f3d1a713 Further fix... 2019-09-23 21:30:12 +08:00
fullwall
023ab5e8a6 Wrong load order 2019-09-23 21:12:21 +08:00
fullwall
c072a0887a Add a super simple command - /npc command. More features as required 2019-09-23 20:29:31 +08:00
fullwall
64e47912c7 Further fixes for guided waypoints 2019-09-22 20:14:33 +08:00
fullwall
b14663c588 Fix guided waypoint provider (?) 2019-09-22 19:23:11 +08:00
fullwall
ccdb7b8d92 Add explanatory message for /npc glowing --color 2019-09-17 19:48:21 +08:00
fullwall
b3589e40f9 Further fix to /npc sound 2019-09-17 19:44:43 +08:00
fullwall
3cef996a24 Fix /npc sound -n bug 2019-09-17 19:30:09 +08:00
SkytAsul
b740cf6c5b Fix exception in chat waypoint trigger (#1928) 2019-08-29 17:22:53 +08:00
fullwall
6f4ec9c4cc Implement new method 2019-08-20 14:35:41 +08:00
fullwall
950ab24800 Add onSpawn to another area of Waypoints 2019-08-12 20:49:36 +08:00
fullwall
5a6820957e Scoreboard tag method doesn't exist in 1.8.8 2019-08-08 22:43:12 +08:00
fullwall
d6ee1e0025 Initialise linearwaypointprovider with NPC 2019-08-07 23:38:37 +08:00
fullwall
51984323dc Fix rename issue 2019-07-23 22:04:36 +08:00
Alex 'mcmonkey' Goodwin
783fe7ad2e
fix defaulting of "/npc sound" ambient 2019-07-23 04:38:20 -07:00
fullwall
f4ef934932 Fix scoreboards, villager level 2019-07-19 01:14:52 +08:00
fullwall
68e9ca68b5 Use NMS#look instead of teleporting to set pitch 2019-07-14 00:24:14 +08:00
fullwall
c7b59c84a7 Fix NPE 2019-07-12 19:18:13 +08:00
fullwall
673ee02542 Migrate glowing stuff to new scoreboard trait, add /npc scoreboard 2019-07-12 15:39:38 +08:00
fullwall
f767c2bbd1 Fix /npc glowing --color 2019-07-12 14:48:10 +08:00
fullwall
0e328ee167 Add /waypoints opendoors 2019-07-12 14:35:30 +08:00
fullwall
82e4f2dcea Delay processing of chunkloadevent 2019-07-07 14:44:08 +08:00
fullwall
74836f6cc3 Add /npc villager for 1.14 2019-07-01 16:14:16 +08:00
fullwall
f9a36bae24 Bump Spigot version 2019-06-26 11:51:58 +08:00
fullwall
8da0b6d228 Preliminary prerelease update 2019-06-24 14:24:11 +08:00
fullwall
d0b358a27c Change /npc mount permission, force chunk load on spawning due to chunk load 2019-06-12 21:06:06 +08:00
fullwall
7b2f08b372 Update /citizens output 2019-05-31 00:23:28 +08:00
fullwall
e7cba79e1a Add a proper 1.14 solution for KEEP_CHUNKS_LOADED 2019-05-29 16:45:18 +08:00
fullwall
489438b2f1 Bump pom, fix trader llamas 2019-05-28 18:03:45 +08:00
fullwall
220fc1623d Use PhTree 2019-05-27 23:19:42 +08:00
fullwall
0e747889e7 Add wander delays 2019-05-26 15:40:54 +08:00
fullwall
04daf1c053 Allow /npc horse -c | -b to be used on chestedhorse entities 2019-05-24 18:32:51 +08:00
fullwall
d9afd7ebdf Don't use door code 2019-05-23 17:32:38 +08:00
fullwall
9fa1646ad6 getField should return null on exception 2019-05-21 19:26:33 +08:00
fullwall
156fbca6ce Add some more explaining text to /npc equip 2019-05-17 17:53:46 +08:00
fullwall
8c30a785a4 Add some javadoc 2019-05-16 19:58:29 +08:00
fullwall
65cbb8850f Support java 12 2019-05-16 17:50:59 +08:00
fullwall
c901bb0ebe Update for 1.14.1 2019-05-14 16:44:32 +08:00
fullwall
4d00e903f3 Too much excluding 2019-05-13 17:04:02 +08:00
fullwall
05e35166c3 Exclude some packages from javadoc 2019-05-13 16:57:25 +08:00
fullwall
68e5fb2570 Fix javadoc pom and reformat other poms 2019-05-13 16:44:50 +08:00
fullwall
47ee8da773 Another javadoc change 2019-05-13 15:34:47 +08:00
fullwall
79d295a7d6 Include Vault properly 2019-05-12 20:52:13 +08:00
fullwall
f28ccb550b Include C-API javadoc 2019-05-12 20:48:17 +08:00
fullwall
b61e909421 Add javadoc goal to C2-main 2019-05-12 20:16:42 +08:00
fullwall
b640788033 Allow chat messages for any equipment slot 2019-05-08 21:04:08 +08:00
fullwall
483c25f11a Add new commands for new 1.14 API 2019-05-07 20:02:14 +08:00
fullwall
b02bcbe38b Temp fix for chunk unloading problem 2019-04-29 15:58:07 +08:00
fullwall
ca8d9c41ea Work around chunk unload change 2019-04-28 20:45:38 +08:00
fullwall
4a73b0faf6 Fix typos for path-distance-margin 2019-04-27 18:31:16 +08:00
fullwall
3e5e77aa3a Remove debug 2019-04-26 23:39:49 +08:00
fullwall
cf874bd301 Temp fix for new 1.14 builds 2019-04-26 23:39:15 +08:00
fullwall
53efb60b68 Add random looking feature to lookclose 2019-04-26 21:14:15 +08:00
fullwall
4c7bc91eaa Fix path distance margin setting 2019-04-26 20:34:21 +08:00
fullwall
cc7d3ae85f Refactor and bugfix customNameUpdate 2019-04-26 18:20:34 +08:00
fullwall
0922694604 Allow users to set the path distance margin as well 2019-04-26 18:10:23 +08:00
mcmonkey
3d893d81d0
bump maven plugins, use ECJ for 1.14 compile 2019-04-25 17:57:54 -07:00
fullwall
eac158eb83 Add shulker peek-look-close 2019-04-25 17:11:02 +08:00
fullwall
ca5cb195b7 Reset pitch after navigation end 2019-04-25 17:03:18 +08:00
fullwall
86f4118683 Set destVector for doors as well 2019-04-25 16:57:36 +08:00
fullwall
0f45b85ca3 Compare to destination vector not block vector for A* 2019-04-25 16:55:48 +08:00
fullwall
0ec8ea68e8 Upgrade to MethodHandles 2019-04-25 15:43:44 +08:00
fullwall
ae96a02e49 Fix backwards compat issue with 1.13.2 2019-04-25 14:41:45 +08:00
fullwall
e6a3329ddc Update pom 2019-04-25 13:27:32 +08:00
fullwall
2d05ca134e Preliminary 1.14 update 2019-04-24 21:01:22 +08:00
fullwall
d08f56e6b1 Implement events 2019-04-23 22:39:51 +08:00
mcmonkey
043b9e87e5
NPC name coloration quick-patch 
this section of code could really stand a total rewrite. Fixes issues with longer-than-16-character coloration, doesn't fix trouble with longer-than-32 if there is any (based on Discord reports)
 2019-04-13 07:08:07 -07:00
fullwall
aea3cd37a7 Merge branch 'master' of github.com:CitizensDev/Citizens2 2019-03-28 22:46:45 +08:00
fullwall
068b85a647 Add extra look call to /npc moveto 2019-03-28 22:46:26 +08:00
mcmonkey
2d0370a55e
patch NPE in followTrait#toggle 2019-03-09 10:36:48 -08:00
Alex "mcmonkey" Goodwin
7c348bff13 Update quick-select and talk items to material names (#1710) 
also add back-support for if the original IDs are used (there's no good generic legacy ID upverter, but recognizing the old default numbers should suffice for 99% of servers). Should be cross-compatible with all supported minecraft versions, but is *required* in particular for 1.13
 2019-03-09 14:19:31 +08:00
mariaum
7d7bf356de Improve 1.8 performance by not just catching exceptions. (#1697) 2019-03-08 00:12:29 +08:00
fullwall
1c9991cf0b Merge branch 'master' of github.com:CitizensDev/Citizens2 2019-03-01 20:50:59 +08:00
fullwall
3feaf43f48 Add unmount flag to /npc mount 2019-03-01 20:50:44 +08:00
mcmonkey
883243a1f1
update maven shade plugin 2019-02-20 07:42:10 -08:00
mcmonkey
1462972f3c
update bStats repo 2019-02-19 02:16:26 -08:00
mcmonkey
f84b6fa08f
fix vault dependence, remove hc repo 2019-02-19 02:12:27 -08:00
Alex "mcmonkey" Goodwin
e281656ad7 Add permission nodes to the commands in plugin.yml, fixes #1700 (#1701) 2019-02-16 14:46:04 +08:00
fullwall
8ed08f0b2e Add skull null check 2019-02-10 12:17:15 +08:00
fullwall
3682faebec Implement new API and fix an error from Paper 2019-02-05 18:12:02 +08:00
fullwall
d7aab0acbd Incorrect comparison 2019-01-19 15:35:09 +08:00
fullwall
e61af2d351 Add fallback wander goal 2019-01-19 15:31:38 +08:00
fullwall
a0aaefcbea Fix compile error, add some wander waypoint API 2019-01-19 00:33:05 +08:00
Silthus
52b3902aca refactor(api): dynamically fetch the current default npc registry (#1672) 
The api now allows setting the default NPC registry therefor commands
and listeners need to fetch the latest version of the NPCRegistry.

#1671
 2019-01-19 00:18:43 +08:00
fullwall
5447561d3d Validate state 2019-01-18 01:56:47 +08:00
fullwall
71b8744060 Implement new API 2019-01-18 01:55:31 +08:00
mcmonkey
50619f3aad
update old version in main plugin pom 2018-12-22 22:22:07 -08:00
Alex "mcmonkey" Goodwin
9e0b4e0ab9 Improve handling of NPC names, fixes #1640 (#1642) 
* Improve handling of NPC names, fixes #1640

Moves the logic to a Util method (instead of duplicated in each module), and adds the "prefixColors" portions (replacing just a static 'RESET' code).
If colors and effects are combined, using only the most recent effect is sufficient (eg reapplying bold) as that should produce effectively no change while still having a color code stuck into the name as is needed to break NPCs looking like real players internally.

* Additional NPC name improvement: fix color code splliting

a name consisting of a color code followed by 15 letters would get split in the middle of the color code, rather than around it. This fixes that.
 2018-12-20 04:44:06 +08:00
mcmonkey
8e9eb3d373
Fix rare error with certain delay trigger setups, for #1630 2018-12-13 01:31:14 -08:00
Alex "mcmonkey" Goodwin
f7b03d27e0
fix follow command max args value 2018-11-30 11:33:45 -08:00
Alex "mcmonkey" Goodwin
05abc9299c Fix spawn chunk NPC loading issues, fixes #1332 (#1625) 
Some misplaced code unintentionally caused chunks to load in the middle of the startup sequence (after NPCs refused to spawn in the chunk, but before the server was fully started), meaning any chunk that normally loads within a few seconds of startup would be loaded already at that time, meaning a chunk load event never fires, and thus any NPCs at that location simply don't spawn in until the chunk is allowed to naturally unload and is later loaded again.
 2018-11-30 22:34:47 +08:00
fullwall
3ca12de138 Add GameModeTrait 2018-11-12 14:53:52 +08:00
fullwall
ae31173ac4 Place waypoint marker in centre of block 2018-10-31 16:52:18 +08:00
fullwall
7dd03e4c36 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-10-29 22:34:40 +08:00
fullwall
0cbf22a944 Stop double execution stop 2018-10-29 22:33:41 +08:00
mcmonkey
8cf35b9041
Improved jar filename 
includes build number
 2018-10-26 10:39:53 -07:00
fullwall
44ee5a2bfe Update helmets 2018-10-27 01:18:11 +08:00
fullwall
ac7e0c1b08 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-10-25 16:49:51 +08:00
fullwall
3c1975f1df Update for 1.13.2 2018-10-25 16:48:15 +08:00
MiniDigger
007794df22 update bstats dependency to new repo (#1585) 
* update bstats dependency to new repo

this commit doesn't update the bstats version to 1.3 yet, that should be done in a separate pr

* fix typo
 2018-10-24 15:24:19 +08:00
fullwall
a545c318a7 Use 1.8.8 API 2018-10-14 21:50:19 +08:00
fullwall
1276365a11 Fix issues with editors not respecting editing player 2018-10-13 11:11:09 +08:00
fullwall
0ecd480790 Stop pathfinding on pause 2018-10-08 23:25:40 +08:00
fullwall
1853a6f474 More QoL for triggers 2018-10-07 14:07:12 +08:00
fullwall
4424f8b9ae QoL enhancements for waypoints triggers 2018-10-07 13:20:56 +08:00
fullwall
a3c99e63e7 Use UUID instead of name in followtrait 2018-10-06 18:31:16 +08:00
fullwall
787e114faa Add a super simple follow trait 2018-10-06 17:11:57 +08:00
fullwall
92121c11e2 Trial portals 2018-10-01 18:36:12 +08:00
fullwall
edc36c76c8 Don't break on different waypoint worlds while editing 2018-10-01 18:05:37 +08:00
fullwall
2254741d09 NPE check in GuidedWaypointsProvider 2018-09-27 20:25:52 +08:00
fullwall
d9a0481a7e Fix for change in EntityTypes fields 2018-09-26 18:57:34 +08:00
fullwall
97d4d7b428 Force armor stands to use the new pathfinder and override packet sending 2018-09-18 18:15:37 +08:00
fullwall
9d14b76d10 Fix TURTLE_HELMET being included in 1.12 and below 2018-09-01 21:22:32 +08:00
fullwall
11166c8bbe Update version and preliminary 1.13.1 update 2018-08-26 20:43:51 +08:00
fullwall
505ef8a926 Use new spawnreason 2018-08-08 16:08:38 +08:00
fullwall
50cc44258f Add TURTLE_HELMET to helmets 2018-08-08 15:45:26 +08:00
Joseph Hirschfeld
56ef4c30ff Use World uuids instead of World names (#1551) 2018-08-08 07:50:08 +08:00
fullwall
0d5d5c4ac6 Check for null world in spawn 2018-07-24 19:52:35 +08:00
fullwall
ecfc4f451c Preliminary 1.13 update 2018-07-22 14:27:08 +08:00
fullwall
9adf755b8b Add some 1.13 traits, fix an issues with backwards API compatibility 2018-07-20 21:57:45 +08:00
fullwall
dfb5b90b38 Preliminary 1.13 update - some known issues 2018-07-19 20:18:47 +08:00
fullwall
d2a0aa637b Remove debug code 2018-06-30 12:56:31 +08:00
fullwall
283fd3ee32 Add elytra effect to flying pathfinder 2018-06-29 22:50:48 +08:00
fullwall
23f03c1fd8 Add PlayerAnimation.START_ELYTRA 2018-06-29 22:35:13 +08:00
Alex "mcmonkey" Goodwin
42fda25ceb Patch skin command, rename command (#1524) 
* Fix npc skin -t argument order

Command input is doc'd as (and should function as) data then signature, but the called method was signature then data... update calls it in correct order. Also, fixes doc to indicate that a name is valid input, not just uuid (not entirely sure how that is handled when sent out in a packet, but it seems to be correct to feed a name)

* Ensure rename command will handle scoreboard changes

Always update prefix/suffix, not just only when team is newly created
Guarantee removal entity from scoreboard team on remove
Also removes a fileheader screwup (first line changed in 1_12_R1 file)
Also removes non-used code bits (the two coloredName lines - they don't actually functionally do anything)
Also removes a duplicated data get call

* patch gamemode command

Uppercase + unique permission node

* patch for names of length 30
 2018-06-27 12:00:03 +08:00
Julian v.d Berkmortel
4ae8a19b33 ( Patch for #1509 ) support zombie villagers in the villager profession trait (#1510) 2018-06-07 17:08:29 +08:00
fullwall
ce9332bc95 Support plugin vanishing in LookClose 2018-06-07 17:01:38 +08:00
fullwall
afd9cb7ca5 Change locale order 2018-06-07 16:59:52 +08:00
fullwall
ecd6df2e15 Increase tablist packet remove delay 2018-06-07 16:57:37 +08:00
fullwall
2ea94aedc9 Text micro-optimisation 2018-05-02 15:18:25 +08:00
DoNotSpamPls
79fc7c426b mcstats.org > bstats.org (#1478) 
Switch to bstats
 2018-04-18 22:22:38 +08:00
fullwall
9e5445e8b1 Delete duplicate resources 2018-04-18 22:19:15 +08:00
fullwall
2b422c1b65 Edit /npc skin -t 2018-04-18 19:29:20 +08:00
fullwall
f4d5f02f34 Fix /npc skin 0t 2018-04-18 09:25:26 +08:00
fullwall
dd9fb15792 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-04-17 15:50:32 +08:00
fullwall
111d3889fe Add /npc skin -t 2018-04-17 15:50:12 +08:00
fullwall
958d1de863
Update CitizensNPC.java 2018-04-10 11:20:29 +08:00