Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 11:05:49 +01:00
Code Issues Projects Releases Wiki Activity
3,397 Commits 6 Branches 0 Tags 106 MiB
7cc2b0658d
Commit Graph

1450 Commits

Author SHA1 Message Date
fullwall
91feca62c7 Add /npc jump and /npc wander 2022-10-08 11:11:40 +08:00
fullwall
eb5adf9667 Convert messages to use minimessage 2022-10-05 22:27:09 +08:00
fullwall
fc83c28085 Consolidate sit implementation, persist sit location to avoid sinking over successive restarts 2022-10-04 23:42:23 +08:00
fullwall
f11f79fe21 Merge branch 'master' of github.com:CitizensDev/Citizens2 2022-10-04 22:18:20 +08:00
fullwall
d11fd91d4a STOP_USE_ITEM not supported 2022-10-04 22:18:05 +08:00
Peridot
2a4f222c3e
Don't use google commons in Util#requiresNettyChannelMetadata (#2907) 
* Improve Util#requiresNettyChannelMetadata

* Fix comment

* Don't use google commons in Util#requiresNettyChannelMetadata
 2022-10-03 09:12:39 +08:00
fullwall
838aa3019b Minor changes 2022-10-02 23:10:23 +08:00
Peridot
bfc7a540cf
Improve Util#requiresNettyChannelMetadata - support newer netty version (#2901) 
* Improve Util#requiresNettyChannelMetadata

* Fix comment
 2022-10-02 02:44:16 +08:00
md5nake
d29781e0b5
Make pathfinder max visited nodes configurable (#2902) 2022-10-02 02:44:06 +08:00
fullwall
20423c0375 Add some basic permissions checks 2022-09-15 02:35:42 +08:00
fullwall
d241cdb370 Update trait commands 2022-09-15 02:28:07 +08:00
fullwall
03e757d411 Fix wither arrow shield typo 2022-09-15 01:01:48 +08:00
fullwall
12b60fcdf2 Fix EntityTransformEvent on old versions of minecraft 2022-09-13 00:56:03 +08:00
fullwall
1977e146d0 Try to deploy parent pom 2022-09-10 10:08:33 +08:00
fullwall
d64cfda050 Update poms for new repo 2022-09-09 19:05:23 +08:00
fullwall
b6563dba8d Block entity transformations if protected 2022-09-09 18:13:01 +08:00
fullwall
eed8457b6d Make /npc list slightly more intuitive 2022-09-09 05:43:25 +08:00
fullwall
e65ac15b6c Add deploy phase 2022-09-09 03:44:45 +08:00
fullwall
1ccc2eae6d Adjust /npc wither charged -> invulnerable, add arrow-shield 2022-09-08 13:28:14 +08:00
fullwall
a70ca4fe8b Update pom.xml 2022-09-08 03:21:27 +08:00
fullwall
f2021cd60e Use @Arg in NPCCommands 2022-09-08 03:01:39 +08:00
fullwall
a316a87711 Implement new flag command API, fix hologram line display 2022-09-07 02:11:07 +08:00
fullwall
61b71cb2d2 Add temporary hologram lines 2022-09-04 00:22:20 +08:00
fullwall
6270985989 Make text edit check argument length, move some code into ProfileFetchThread 2022-09-03 15:39:08 +08:00
fullwall
479e350f12 Compare center 2022-08-22 22:51:33 +08:00
fullwall
6b2440d8c3 Change logging 2022-08-22 22:30:51 +08:00
fullwall
0a0f4a8c63 Add debugging command 2022-08-22 22:10:48 +08:00
fullwall
a1da32d1d6 Change default delay setting 2022-08-21 21:34:53 +08:00
fullwall
30b2f5a8e2 Placeholders for speech bubbles, /npc command errormsg 2022-08-21 16:15:40 +08:00
fullwall
9592de5716 Sets.difference is not working in 1.8.8 2022-08-17 23:33:29 +08:00
fullwall
8bee4c8b80 Fixes to hologramtrait 2022-08-12 13:48:54 +08:00
fullwall
0645934c1e Clamp yaw properly for smoothrotationtrait 2022-08-09 23:07:48 +08:00
fullwall
4bb3ee8845 Bump to 1.19.2 2022-08-06 10:20:03 +08:00
fullwall
7bbe87be0b Move EntitiesLoadEvent to a separate file 2022-08-05 12:01:07 +08:00
fullwall
0afeb4792d Use EntitiesLoadEvent instead of ChunkLoadEvent, other minor fixes 2022-08-04 11:48:48 +08:00
fullwall
3409b06b93 Fix zombievillager error in 1.8 2022-08-02 23:06:56 +08:00
fullwall
967fea021e Use placeholders in /npc shop 2022-07-29 09:15:15 +08:00
fullwall
8b488ddc61 Fix spaces in server names 2022-07-29 02:03:16 +08:00
fullwall
7f993e2c1d Cleanup and use new method 2022-07-28 23:34:03 +08:00
fullwall
748af9f9bd Implement new methods 2022-07-28 15:43:24 +08:00
fullwall
e9d197eab0 Simplify navigator interface 2022-07-28 15:36:16 +08:00
fullwall
7b3c0c8126 Add /npc allay 2022-07-28 06:36:51 +08:00
fullwall
2aa6b860c4 1.19.1 update 2022-07-28 05:03:30 +08:00
fullwall
70d7cfa6f2 Work on npc shop; now possible to buy and sell 2022-07-27 17:05:52 +08:00
fullwall
1f9931fdff Use setClickHandler 2022-07-27 03:40:46 +08:00
fullwall
d888d13955 Switch back to sending scoreboards on change only 2022-07-27 03:27:49 +08:00
fullwall
2b88eb7aaa All NPCs should send scoreboard teams on player join 2022-07-27 01:29:10 +08:00
fullwall
048f0877c8 Temporarily update scoreboard every time 2022-07-27 00:19:47 +08:00
fullwall
9cf7779ff4 Work on /npc shop, QoL tweaks, fix scoreboard team removal 2022-07-26 23:50:28 +08:00
fullwall
5dbc578fd2 Integrate team creation directly into ScoreboardTrait 2022-07-25 23:14:00 +08:00
fullwall
71bc177298 Try scanning the online players less 2022-07-25 15:53:34 +08:00
fullwall
acca94d911 Aggressively send scoreboard teams 2022-07-25 15:40:39 +08:00
fullwall
ac92bafa71 Null check command charged 2022-07-25 00:23:44 +08:00
fullwall
d5db707d58 Update /npc metadata remove message 2022-07-23 02:01:57 +08:00
fullwall
a90c319563 Don't try to swim if gravity disabled 2022-07-22 21:15:24 +08:00
fullwall
d7ce79fe85 Update maven pom plugin version and trial a microoptimisation for players 2022-07-22 15:22:55 +08:00
fullwall
b89073d4c1 Attempt to fix title updating 2022-07-22 00:43:40 +08:00
fullwall
8c004fc122 Work on /npc shop 2022-07-21 23:13:51 +08:00
fullwall
805cd35f90 Wrong ChatColor import 2022-07-17 23:01:59 +08:00
fullwall
e783423f84 Fix a minor bug with /npc shop 2022-07-17 23:01:00 +08:00
fullwall
9c9199d2a1 Make llamatrait 1.12 compatible, work on /npc shop 2022-07-17 22:29:11 +08:00
fullwall
34aea6553c Manually prevent clientside prediction for allay pickups, prevent item pickups on protected mobs 2022-07-17 02:47:36 +08:00
fullwall
674a621cf3 Fix itemcost, don't execute commands if cost not reached 2022-07-17 02:28:17 +08:00
Mitsu
bbf5ca9ebb
Update messages_fr.properties (#2831) 
I have added a French translation that I made for my server
 2022-07-17 02:11:42 +08:00
fullwall
a81d8db87d Null check bossbar style 2022-07-17 02:10:38 +08:00
fullwall
58b53174c8 Fix itemframes, add /npc debug command, don't lowercase skin names early in skintrait 2022-07-15 10:21:44 +08:00
fullwall
f462fe9218 Add null check 2022-07-13 20:10:42 +08:00
fullwall
4dfac9c62d Remove team unregistering to ScoreboardTrait, add scoreboard-teams send ticks to assist with a possible scoreboard conflict 2022-07-13 20:09:21 +08:00
fullwall
3fcf8931f7 Consolidate versioned trait commands 2022-07-10 01:53:34 +08:00
fullwall
aaca31740b QoL changes to /npc list /npc command 2022-07-10 01:17:26 +08:00
fullwall
665e19d472 Check for online players in /npc remove --owner 2022-07-08 22:15:48 +08:00
fullwall
98c2d3492a Add /npc piglin --dancing 2022-07-07 23:34:15 +08:00
fullwall
35dd4078dd Fix double updating bee/bat/ghast AI 2022-07-05 19:13:31 +08:00
fullwall
dfbdfaed09 Add entity spawn wait ticks settings for debugging purposes 2022-07-03 14:39:45 +08:00
fullwall
55f8a1f75c Fix say in /npc command 2022-06-30 16:10:16 +08:00
fullwall
58da8489e4 Use new builder style WanderGoal 2022-06-29 18:14:47 +08:00
fullwall
d7617637b7 Fix SmoothRotationTrait rotating towards 0 on respawn 2022-06-26 23:28:38 +08:00
fullwall
c6a1aba5bd Fix smoothrotation calculations 2022-06-26 14:19:27 +08:00
fullwall
9ce4a9020f Rework /npc text 2022-06-26 13:57:51 +08:00
fullwall
e54e4434cc Speech bubbles persist 2022-06-26 11:47:40 +08:00
fullwall
5cd35fdcea Make --id check less specific 2022-06-25 18:15:19 +08:00
fullwall
8c4b72c5f8 Modify blockbreaker distance calculations 2022-06-25 17:01:02 +08:00
fullwall
659a5b17ad Match npc commands slightly more safely 2022-06-25 16:47:48 +08:00
fullwall
1cdeda5d5d Add 'say' option to /npc command and add the NPC id for /npc commands 2022-06-25 16:47:13 +08:00
fullwall
36cbef81a7 Fix dropstrait, allow player hurt/death sound to be set 2022-06-24 12:43:23 +08:00
fullwall
9906c44ff3 Cancel navigation once in range 2022-06-22 12:37:02 +08:00
fullwall
bf532728d1 Set destination even for non NPCs 2022-06-22 12:35:01 +08:00
fullwall
1ca256753b Target the blockbreaker block directly and adjust pathDistanceMargin to get close enough to it 2022-06-22 12:18:06 +08:00
fullwall
d0366bccde Measure block breaker distance from center block 2022-06-22 12:13:10 +08:00
fullwall
318596c715 Adjust minecraft pathfinder to look less frequently and pathfind closer to destination in players 2022-06-21 23:52:25 +08:00
fullwall
cd652db2f7 Use new methods 2022-06-19 12:05:18 +08:00
fullwall
6a15bc2d5a Implement sittrait 2022-06-14 21:39:20 +08:00
fullwall
4768a4f76a Add SitTrait for NPCs 2022-06-14 21:38:15 +08:00
fullwall
138aaacbcf Fix null check in age 2022-06-14 21:26:18 +08:00
fullwall
2e2a83779e Implement anvil GUI 2022-06-12 19:49:21 +08:00
fullwall
21f3a7755a Implement new API 2022-06-12 01:37:38 +08:00
fullwall
53d8e96c8d Fix tadpoles, /npc goat, don't build unnecessary modules 2022-06-11 15:17:17 +08:00
fullwall
aaf870372c Remove entity if world failed to add 2022-06-11 12:41:24 +08:00
fullwall
d98833ca66 Remove exception printing for now 2022-06-08 22:57:35 +08:00
fullwall
4c3224efad Remove eclipse compiler from poms 2022-06-08 14:07:33 +08:00
fullwall
2a6a69d8be Including mockito prevents testing deps from shading 2022-06-08 12:48:58 +08:00
fullwall
d94e83b74c Attempt to update to 1.19 2022-06-08 11:58:22 +08:00
fullwall
7f1bb5b2b7 Fix yaw/pitch calculations for face towards yaw/pitch 2022-06-05 15:43:46 +08:00
fullwall
70c4ab6da8 Fix npcdamageentity event default cancelled 2022-06-05 15:12:16 +08:00
fullwall
3ff64493cd Fixed commandtrait output 2022-06-02 20:15:45 +08:00
fullwall
a38baa48b5 Use single use behavior for /npc blockbreak 2022-05-31 22:47:00 +08:00
fullwall
1c459c3da2 Unify getCurrentDestination semantics 2022-05-26 22:07:26 +08:00
fullwall
487d587675 Apply nogravity immediately on spawn and on usage 2022-05-26 15:58:54 +08:00
fullwall
8a68b575a2 Reduce skin update distance 2022-05-22 17:39:47 +08:00
fullwall
6d1e848d89 Add debug when sending skins to players 2022-05-22 17:36:48 +08:00
fullwall
8292a952cd Fix /npc leashable 2022-05-08 21:57:15 +08:00
fullwall
8979fda81d Update to use new method 2022-05-06 21:45:49 +08:00
fullwall
47dbd881f5 Use new API 2022-05-06 21:25:12 +08:00
fullwall
c880ef8bc5 wp dt is now a toggle 2022-05-03 20:08:16 +08:00
fullwall
7092926784 Require at least one trait to remove 2022-05-01 19:48:30 +08:00
fullwall
e4cd18b6e4 Implement new breaker API 2022-04-30 05:58:47 +08:00
fullwall
97da84c192 Fix gcooldown not working when used in isolation 2022-04-30 02:39:26 +08:00
fullwall
234c99b2af Refactor rotation more 2022-04-25 22:29:26 +08:00
fullwall
8694603c85 Refactor PlayerControllerLook into RotationTrait 2022-04-25 02:22:39 +08:00
fullwall
324d94a21f Rename /npc pose --save to /npc pose --mirror and add /npc pose --save to save the current NPC pose 2022-04-24 19:22:55 +08:00
fullwall
3685d33980 Add /npc bossbar --track and fix equipment caching logic 2022-04-23 13:42:48 +08:00
fullwall
48798ff9b3 Abs diff 2022-04-21 15:27:46 +08:00
fullwall
e82eb76aba Update holograms if height changes 2022-04-21 15:25:57 +08:00
fullwall
96ba80edd8 Persist use new pathfinder if set manually 2022-04-20 11:55:15 +08:00
fullwall
46a6c64cf5 Convert skin name mismatch exception to debug instead 2022-04-19 21:55:41 +08:00
fullwall
2e886cf8ed Make version incompatible message suggest upgrading Minecraft 2022-04-19 18:16:48 +08:00
fullwall
0a6225a8a3 Fix /npc remove --world 2022-04-19 18:13:40 +08:00
fullwall
719f115f0c Add /npc panimate (does not persist animations as yet) 2022-04-19 15:50:52 +08:00
fullwall
e88a7b6278 Clean up Util 2022-04-19 15:33:52 +08:00
fullwall
f358f6fb2e Work towards lookclose rotation speed changing 2022-04-19 15:20:59 +08:00
fullwall
733064c18d Add /npc remove --world 2022-04-19 11:54:05 +08:00
fullwall
f4e3786514 Fix bug and add a method to simplify name showing 2022-04-17 14:51:05 +08:00
fullwall
da76924041 HologramTrait should have nameplate visible 2022-04-17 13:37:29 +08:00
fullwall
166aa3d739 Add /trc options to the base /npc lookclose command 2022-04-16 22:49:20 +08:00
fullwall
b0f1290b58 Change EAT_FOOD to LEAVE_BED in 1.18/17 2022-04-13 11:14:37 +08:00
fullwall
2a5b62aae0 Remove bossbar on despawn 2022-04-09 11:41:12 +08:00
fullwall
af08a77b8e Add customisation of initial no damage ticks 2022-04-06 12:39:58 +08:00
fullwall
41b1ef57c9 Fix spawned debug message 2022-04-03 11:48:42 +08:00
fullwall
2c8b1864d8 Null check enderdragon bossbar again, set blank hologram names to hover 2022-03-23 20:57:18 +08:00
fullwall
cd12fefe73 Trial fix to paper delaying non-player mob spawns 2022-03-16 17:13:05 +08:00
fullwall
577dc72101 Don't register MobType class 2022-03-15 10:11:36 +08:00
fullwall
4bf4dc0651 Add more info to debug messages to help with debugging 2022-03-14 04:25:42 +08:00
fullwall
b5f179628a Cap load factors consistently 2022-03-13 18:21:15 +08:00
fullwall
3a5e43b779 Cap skin packet tracker max entries 2022-03-13 18:19:32 +08:00
fullwall
9acf264db3 Unclear why right clicks are cancelled in saddle trait 2022-03-12 18:48:18 +08:00
fullwall
4a612392ed Null check bounding boxes 2022-03-12 14:27:37 +08:00
fullwall
4397aa4ae8 Barrier for /npc equip 2022-03-12 02:50:50 +08:00
fullwall
a16226ccaf Allow /npc equip to work with Striders, fix a bug with /npc look 2022-03-12 00:17:46 +08:00
fullwall
d00678b208 Null check registry on disable 2022-03-10 03:17:27 +08:00
fullwall
51cecf9cff Reify shoptrait 2022-03-04 22:14:28 +08:00
fullwall
ae36f4bd9f Add custom holder support to CustomEntityRegistry 2022-03-04 20:23:59 +08:00
fullwall
0a91768369 Update for 1.18.2 2022-03-01 20:54:08 +08:00
fullwall
dfb63084b2 Run source format 2022-02-28 17:01:59 +08:00
fullwall
89e06a3e67 Add null checks 2022-02-21 17:36:57 +08:00
fullwall
897c511757 Fix dragon yaw and make it same as rider yaw. Refactor out redundant calculation of yaw 2022-02-20 22:34:29 +08:00
fullwall
97d4c3b117 Make nonliving entities look at entities too, fix /npc lookclose with shulkers spamming noises 2022-02-20 21:56:51 +08:00
fullwall
626b6d6b42 Allow NPCs to push other entities 2022-02-20 21:21:50 +08:00
fullwall
65c7e7c28c Also make guided waypoints reset when chagned 2022-02-20 11:19:05 +08:00
fullwall
b56a1f85e1 When changes to the API waypoints list are made they should be reflected in the waypoints goal 2022-02-20 11:13:46 +08:00
fullwall
ecbab327ed Fix some bugs 2022-02-20 10:04:09 +08:00
fullwall
b1b5704145 Cancel move destination on navigation stop 2022-02-20 01:31:13 +08:00
fullwall
be019c0e83 Refactor blockbreaker, add /npc blockbreak 2022-02-20 01:05:38 +08:00
fullwall
87d27c09dc Don't reset custom name (TBC if 1.8.8 is affected) 2022-02-19 20:27:41 +08:00
fullwall
6fd6d12092 Update held item status every tick 2022-02-19 19:00:09 +08:00
fullwall
b12ae2ee66 Improve underwater pathfinding, cleanup 2022-02-19 18:26:37 +08:00
fullwall
b26dfb3d0f Implement new PathStrategy method, improve swimming navigation 2022-02-19 16:36:31 +08:00
fullwall
208b1c9ca2 Add extra info to /npc command 2022-02-19 14:36:45 +08:00
fullwall
aacff7b45a Add rudimentary /npc undo, some misc cleanup 2022-02-19 13:35:16 +08:00
fullwall
984ce6d9e7 Improve underwater mobs staying in place 2022-02-16 17:36:03 +08:00
fullwall
bf56a6dcb2 Add glowing for non-player characters, stop 1.8.8 noDamageTicks from going down too fast 2022-02-15 01:35:07 +08:00
fullwall
a29fb3059a Add /npc useitem 2022-02-15 00:57:22 +08:00
fullwall
88ab30840b Add debug to chunk load tracking, clarify charging logic in commands 2022-02-15 00:40:24 +08:00
fullwall
5bf9fdc6c9 Make NavigatorParameters#run run consistently 2022-02-13 21:39:22 +08:00
fullwall
676590f5fe Fix /npc command gcooldown 2022-02-13 17:33:44 +08:00
fullwall
3ca65765a3 Fix first time players 2022-02-11 18:46:11 +08:00
fullwall
c60085eade Waypoint markers should be spawned at the actual location now 2022-02-07 19:03:21 +08:00
fullwall
bef0f16f3b Cancel current move destination when navigator paused 2022-02-02 21:40:19 +08:00
fullwall
5c3878d2f8 Implement destinationTeleportMargin. Tweak pathfinding in an attempt to fix minecraft navigation issues with players. Expect changes. 2022-01-29 14:56:29 +08:00
fullwall
cbfd57e9c0 Fix logic error for offlineplayers 2022-01-28 18:01:54 +08:00
fullwall
927d27e09c List profession/rabbit type values using the pretty formatter 2022-01-27 10:48:52 +08:00
fullwall
7683516d62 Avoid setting NPC.COLLIDABLE_METADATA on Player NPCs 2022-01-20 17:10:52 +08:00
fullwall
b5a2c30476 Enhance /npc metadata 2022-01-17 15:45:04 +08:00
fullwall
1ee92a07ea Implement cross-world teleporting for NPCs 2022-01-16 14:05:23 +08:00
fullwall
c702e19828 Implement metadata on examiner side, relax distance margin for minecraft movement 2022-01-15 21:00:18 +08:00
fullwall
23c4779404 Set exp level for /npc command expcost rather than exp % 2022-01-12 02:01:30 +08:00
fullwall
83022b05ab Delete old code 2022-01-06 19:25:35 +08:00
fullwall
e4ca2f2922 addWaypoint method for LWP 2022-01-06 19:25:01 +08:00
fullwall
bf3bf6f776 Add /npc llama -c/b 2022-01-02 01:33:19 +08:00
fullwall
5fffa23e94 Add packet update delay setting 2022-01-02 01:22:35 +08:00
fullwall
85cf761933 Further micro-optimisation 2021-12-29 00:42:20 +08:00
fullwall
19ee0e2c19 Use metadata and track players if on the playerlist which should make mobs spawn nearby 2021-12-28 20:13:25 +08:00
fullwall
750f8e2e4c Implement helper methods and allow hologram lines to be items 2021-12-27 23:59:21 +08:00
Fredthedoggy
13f7961556
SkinTrait should only update if the Placeholder changes (#2703) 
* Make SkinTrait only update when required

* Add back skinName check
 2021-12-12 22:44:36 +08:00
fullwall
81404b4d41 Initial update to 1.18.1 2021-12-11 11:15:00 +08:00
fullwall
d1a1e7d3c2 Add placeholderAPI to pom for javadoc 2021-12-05 11:37:15 +08:00
fullwall
22fe84831e Initial 1.18 update 2021-12-01 22:56:22 +08:00
fullwall
6b30d06705 Set collidable scoreboard option and always test for placeholders in skin names 2021-11-29 20:56:13 +08:00
fullwall
3da3cc2ae8 Fix /npc villager --profession error message, more sane boundingbox calculation 2021-11-27 12:19:19 +08:00
fullwall
caff1e9ba4 As a safety measure limit maxY <0.6D 2021-11-21 22:14:01 +08:00
fullwall
61c6863d5f Trial collision box checking for pathfinding to assist with half blocks - needs testing especially with doors 2021-11-21 22:12:17 +08:00
fullwall
3d1d2ef222 Add missing flags for /npc endercrystal 2021-11-20 23:46:09 +08:00
fullwall
968f3fd68b Add /npc command hideerrors 2021-11-19 23:32:28 +08:00
fullwall
78824a341e Update existing hologram npcs in setLine 2021-11-19 23:18:24 +08:00
fullwall
b55407c696 Send npc command selector text using Citizens messaging 2021-11-18 22:47:09 +08:00
fullwall
7c8b136e1d Add /npc command expcost 2021-11-01 20:56:54 +08:00
fullwall
57adea419a Null check missing world 2021-10-30 15:53:49 +08:00
fullwall
21e924f04c equalsIgnoreCase in /npc owner 2021-10-20 18:40:49 +08:00
fullwall
25f341ef63 /npc owner [name] supported again 2021-10-13 17:56:22 +08:00
fullwall
4ecf09050a Drop owner string from Owner trait 2021-10-12 20:42:57 +08:00
fullwall
780899cbad Make /npc chunkload persistent by default 2021-10-10 23:19:43 +08:00
fullwall
18423134fa Trial fix for duplicate UUID spawned 2021-09-27 01:36:23 +08:00
fullwall
3d3de6576d Use onPreSpawn event to avoid 'FOUC' in armorstands. Fix invulnerable ticks being reduced too quickly. 2021-09-23 14:12:44 +08:00
fullwall
620cda6542 Check hologram height on spawn properly 2021-09-21 17:24:13 +08:00
fullwall
49559e26bc HologramTrait now alters hologram height if name visibility is toggled 2021-09-21 16:12:15 +08:00
fullwall
db825cce72 Add rough impl of SneakTrait 2021-09-20 20:59:54 +08:00
fullwall
004c46ab76 Extra plugin disabled check 2021-09-18 15:35:13 +08:00
fullwall
cffb0519e0 Add backcompat code 2021-09-17 20:32:41 +08:00
fullwall
cdb7cbba4a Fix chunk tickets being removed when Citizens is disabled, return correct NPC entity in HologramTrait 2021-09-17 19:04:52 +08:00
fullwall
7952600382 Add simple chunk ticketing system for pathfinding 2021-09-09 18:21:00 +08:00
fullwall
9f856f0565 Check currentLoc status 2021-09-05 14:59:19 +08:00
fullwall
11c48c4e09 Check isSpawned in HologramTrait#onSpawn 2021-08-27 17:30:27 +08:00
fullwall
14a6004adf Cap skinupdatetracker map size 2021-08-20 21:22:46 +08:00
fullwall
732716215e Make hologram trait update more frequently 2021-08-15 15:25:09 +08:00
fullwall
ef1baf5679 Add setMountedOn to MountTrait 2021-08-15 14:40:11 +08:00
fullwall
1ef3e6b56b Save to disk on dependent plugin disable 2021-07-25 08:52:03 +08:00
fullwall
9904e034fd Make plugin disable hack more conservative 2021-07-21 18:51:04 +08:00
fullwall
cfa4b5fc59 Delete unused files 2021-07-19 23:03:04 +08:00
fullwall
d4c557d5b2 Improve /npc text editor, implement speech bubbles, allow armor stands to pathfind using the A* finder, allow /npc bossbar to work on all entities 2021-07-19 23:02:41 +08:00
fullwall
55cf0c4ccd Preemptive event deregistration 2021-07-18 19:30:45 +08:00
fullwall
0ff3ee72e9 Move costs to after other precondition check 2021-07-16 23:23:57 +08:00
fullwall
bc3df49775 Work on plugin disable hack 2021-07-16 17:25:04 +08:00
fullwall
d5434b845e Adjust hologramtrait 2021-07-16 17:23:36 +08:00
fullwall
dfc48ec475 Make plugin disable hack more compatible 2021-07-15 19:41:03 +08:00
fullwall
c3a70e27ed Add workaround for spigot disable issue 2021-07-14 21:23:55 +08:00
fullwall
53e2b50ce8 Fix bugs including 1.17.1 player movement, flying yaw and stats incompatibility on 1.17.1 2021-07-10 00:47:05 +08:00
fullwall
3e1132034e Update to 1.17.1 2021-07-07 22:12:15 +08:00
fullwall
ba51211020 Merge branch 'master' of github.com:CitizensDev/Citizens2 into master 2021-07-05 23:39:24 +08:00
fullwall
3a50ad5d85 Add /npc axolotl 2021-07-05 23:39:15 +08:00
SiderealArt
597648276a
Add Traditional Chinese translation (#2585) 2021-07-05 23:39:00 +08:00
SirBlobman
15583711b6
Update pom.xml (#2591) 
This will remove warnings relating to `maven-default-http-blocker` and JitPack attempting to resolve SNAPSHOT dependencies.
 2021-07-05 23:29:03 +08:00
fullwall
ef4d746aee Add debug for hologram trait 2021-07-04 13:07:15 +08:00
fullwall
5306a68b6a Fix target location for mc navigator 2021-06-29 00:10:24 +08:00
fullwall
9c8d26e73b Use new waterlogged methods 2021-06-25 17:01:18 +08:00
fullwall
d2f0d7ec20 Cleanup of old command code 2021-06-13 14:53:19 +08:00
fullwall
b1990138d8 Add getFirst<Getter|Setter> API 2021-06-13 13:41:36 +08:00
fullwall
f2d4c38843 Preliminary update to 1.17 - known bugs include every entity glowing 2021-06-13 03:20:18 +08:00
fullwall
2d5e418cf8 Expose hologram entities 2021-06-03 20:36:45 +08:00
fullwall
85c1f8f732 Fix horse mounted navigation 2021-05-30 00:23:13 +08:00
fullwall
22fd1da0c8 Add option to avoid talk-close to NPCs 2021-05-18 14:49:17 +08:00
fullwall
0ddfcbd0fa Add WIP falling movement examiner 2021-05-13 15:41:49 +08:00
Mich3l3k
cf6cbaf4a3
Translate to polish (#2539) 
* Translate to polish

I will finish translate soon (do not accept this yet, I will convert this to UTF-8 after end this).
Have a nice day!

* upgrade messages_pl.propierties again

next translated messages...

* and again...

* Finish poland translate for citizens

Everything works, i translated ~~80-90% messages, this 10-20% are messages which I didnt translate because I didnt want do a mistake
Youre Welcome
 2021-05-11 13:05:06 +08:00
Alex "mcmonkey" Goodwin
4dc123bb4b
Refactor scoreboard handling to use instant scoreboard application at spawn (#2544) 
Full description in PR https://github.com/CitizensDev/Citizens2/pull/2544
 2021-05-08 02:02:17 +08:00
fullwall
a4dde9f017 Add basics of /npc gui 2021-05-08 01:55:53 +08:00
fullwall
8c120aae52 Remove living entity requirement for /npc name 2021-05-07 01:48:22 +08:00
fullwall
3d85ad4ea8 Add /npc chunkload 2021-05-07 01:46:59 +08:00
fullwall
c24ce1e1ed Use NMS methods for isSolid checking 2021-04-30 10:31:25 +08:00
fullwall
c9d8bad4f8 Fix waypoints load order 2021-04-28 22:14:59 +08:00
fullwall
354625afc8 Default bystanders hear targeted chat to false 2021-04-25 12:15:14 +08:00
fullwall
145f9e4f41 Fix sequential command execution with commands on both hands 2021-04-25 12:06:59 +08:00
fullwall
0e1e3586af Block protected NPCs from entering boats/minecarts 2021-04-22 22:22:46 +08:00
fullwall
9562345a7a Fix /npc sound dependency being removed 2021-04-17 21:34:46 +08:00
fullwall
3c1d48137d Pass InventoryDragEvent to GUI menu 2021-04-15 23:25:13 +08:00
fullwall
3ad450b1be Don't log exceptions in old java versions for module opening 2021-04-15 00:28:49 +08:00
fullwall
777a62036f Don't use the bukkit metadata system which is unreliable for respawning entities 2021-04-14 19:59:19 +08:00
fullwall
e63f0ccede Fix entity markers on guided waypoint editor and make toggle path / clear more lenient. Tweaked some copy on the commands to give a better explanation of the guided waypoint feature. 2021-04-14 19:53:49 +08:00
fullwall
b986c4dcb8 Fix cooldown setting message parsing - $ was not included in initial setting default, changed substitutor to avoid migrating settings 2021-04-14 19:41:37 +08:00
fullwall
3a9e538c00 Fix reflective access warnings 2021-04-14 15:03:39 +08:00
fullwall
ca421b9cef Sync naming 2021-04-14 02:01:34 +08:00
fullwall
874b2f660c Fix typo 2021-04-14 01:52:48 +08:00
fullwall
a8a18e15c0 Add help to /citizens reload 2021-04-14 01:52:13 +08:00
fullwall
8612e329b6 Add warning to /npc reload 2021-04-14 01:51:11 +08:00
fullwall
979d6f95fa Fire NPCTeleportEvent in all cases to allow cancelling 2021-04-13 12:06:22 +08:00
fullwall
eb4262a80f Try to remove reflective access warning on Java 11 2021-04-08 18:47:46 +08:00
fullwall
011e58c739 Fix inverted condition in lookclose 2021-04-07 14:26:07 +08:00
fullwall
c7789e5073 Remove extra NPCDespawnEvent 2021-04-05 16:38:10 +08:00
fullwall
74839e9843 Fix NPE in lookclose 2021-04-04 11:31:43 +08:00
fullwall
fa0cf4fc95 Revert back to old style loading for skin trait 2021-03-20 20:38:11 +08:00
fullwall
5ec9470885 Fix load order problem in placeholder skins 2021-03-20 20:31:53 +08:00
fullwall
643e42f4ba Add basic named parameters for time purposes in command trait 2021-03-13 22:17:55 +08:00
fullwall
f46285b238 Disable flock caching 2021-03-02 20:52:41 +08:00
fullwall
8a87326c44 Only store lastUUID, not full NPC instance 2021-03-01 21:10:29 +08:00
fullwall
8afaf23c1d Add /npc create -t and make named registry autocreate 2021-02-27 14:41:05 +08:00
mariaum
0b41b24425
Fix blank names for a few seconds after spawning a npc. (#2477) 2021-02-22 19:27:06 +08:00
fullwall
6c26f98080 Add /npc create --registry 2021-02-22 19:26:12 +08:00
fullwall
441923191f Add /npc endercrystal 2021-02-18 23:29:15 +08:00
fullwall
d99109d0b2 Try translate NPCCommandSelector message 2021-02-14 11:01:56 +08:00
fullwall
34398f09d5 Allow unequipping of certain slots 2021-02-11 23:00:18 +08:00
fullwall
352ec56f5e Add more fallback material 2021-02-10 22:02:14 +08:00
fullwall
5c62a3f92f Add legacy fallback 2021-02-10 19:58:23 +08:00
fullwall
54a66f33f3 Increase death animation ticks 2021-02-08 19:52:30 +08:00
fullwall
9bbe9ae3c4 Add simple /npc drops GUI and add NPC selection to /npc follow 2021-02-07 18:45:10 +08:00
fullwall
65d02398fb Add a separation mechanic to /npc follow 2021-02-04 16:34:20 +08:00
fullwall
52a004fcaf Use and implement new registry API 2021-02-04 10:10:48 +08:00
fullwall
8039f6e9d3 Add lookclose setting 2021-02-04 09:51:02 +08:00
fullwall
c28cf09ef3 Use new API for 1.8 compatibility 2021-02-03 23:13:49 +08:00
fullwall
cd436cb6da "/npc select" should respect clickredirects 2021-02-02 22:33:16 +08:00
fullwall
e03d65aeb4 Add /npc command itemcost 2021-02-01 22:35:28 +08:00
fullwall
f776638508 Add enderman equipment GUI 2021-01-31 23:40:42 +08:00
fullwall
f1c2fcbe37 Add new pig equipper GUI 2021-01-31 18:29:44 +08:00
fullwall
47707fe628 Implement inventory GUI into /npc equip 2021-01-31 00:29:27 +08:00
fullwall
0ded25ad5e Implement new change 2021-01-29 00:15:43 +08:00
fullwall
0499839115 Fix navigation bug with duplicate examiners, add change detection to scoreboard to avoid sending as many packets 2021-01-27 22:38:50 +08:00
fullwall
66a3855aa8 Update to match current API 2021-01-26 23:28:38 +08:00
fullwall
8e31baf202 Edit equipment GUI 2021-01-25 23:47:43 +08:00
fullwall
6c2f5fa65a Remove extra check 2021-01-25 21:30:48 +08:00
fullwall
ac106a6c50 Add line of sight check to lookclose 2021-01-25 21:30:07 +08:00
fullwall
60db622b68 Add debug code 2021-01-24 22:42:51 +08:00
fullwall
13195612cf Limit should default false 2021-01-24 22:08:43 +08:00
fullwall
80187501d0 Check lookclose new target from event 2021-01-23 10:52:53 +08:00
fullwall
351cee2cc6 Implement new event 2021-01-20 22:10:47 +08:00
fullwall
eb9764aeb0 Further refactor lookclose 2021-01-20 20:27:46 +08:00
fullwall
fe3f12e424 Refactor lookclose findNewTarget 2021-01-20 19:52:02 +08:00
fullwall
8c0fa7cd17 Comparison should be squared 2021-01-20 17:49:43 +08:00
fullwall
58443ee726 Make lookclose more consistent at looking at players 2021-01-20 17:34:24 +08:00
fullwall
3f4a4af581 Change permissions defaults to op 2021-01-19 19:41:24 +08:00
fullwall
e6eac4e675 Fix push events with listeners 2021-01-17 07:05:35 +08:00
fullwall
5821416f90 Update pom version 2021-01-16 18:06:12 +08:00
fullwall
cc3d8f84c7 Fix double sending of command messages with LINEAR execution 2021-01-15 22:06:03 +08:00
fullwall
918fcb9ca7 Fix skin trait and text bugs 2021-01-15 19:00:30 +08:00
fullwall
261ac1b4b1 Check texture data is actually valid 2021-01-10 23:52:24 +08:00
fullwall
97fae0a7e4 Add UUID to /npc 2021-01-04 00:18:34 +08:00
fullwall
c366b5f79e Add missing Util changes 2021-01-03 00:14:00 +08:00
fullwall
37e6414b13 Fix some off-by-one errors 2021-01-02 20:25:29 +08:00
fullwall
0b1a8cc369 Null check for skinname 2020-12-29 14:25:12 +08:00
fullwall
1ae074278e Leave editor 2020-12-28 11:12:16 +08:00
fullwall
87a4c3f6c4 Fix memory leak 2020-12-28 11:04:14 +08:00
fullwall
21163e4ec4 Add placeholder support for skins 2020-12-28 10:39:56 +08:00
fullwall
cc5c132347 Arm swing on player sees player-npc, not spawn 2020-12-28 08:24:30 +08:00
fullwall
284565598e Trial a new method for fixing spawn body yaw, fix /npc rename not applying hologram name immediately 2020-12-27 20:54:21 +08:00
fullwall
79f048fe0c Implement new metadata for /wp disableteleport 2020-12-26 17:01:27 +08:00
fullwall
b9e6418d52 Add new debug-chunk-loads setting 2020-12-24 19:03:21 +08:00
fullwall
aa136420c8 Make initial skin packet delay configurable 2020-12-24 19:00:35 +08:00
fullwall
09c482e2f6 Check skin name length is 3-16 characters when fetching players 2020-12-21 17:32:30 +08:00
fullwall
4c33fa4f86 Add worldguard region support to wander waypoint provider 2020-12-21 17:27:52 +08:00
fullwall
ec1a639d08 Add workaround for new CraftSound changes 2020-12-21 11:28:38 +08:00
Camotoy
91fcad1499
Fix llamas not being controllable with '/npc controllable' (#2412) 
Llamas are looped in with horses for certain traits (such as having an inventory) but not in movement. This commit excludes llamas from the `updateHorizontalSpeed` check as they cannot be controlled in vanilla.

Tested with 1.12.2 and 1.16.4.
 2020-12-21 11:08:44 +08:00
fullwall
fe7f6e373f Add /npc polarbear -r and restore target and goal selectors 2020-12-17 13:13:23 +08:00
fullwall
040930bcde Add /npc command --gcooldown 2020-12-16 18:12:37 +08:00
fullwall
1266298442 Allow straight line navigator to track entity exactly 2020-12-16 17:59:20 +08:00
fullwall
87cadbfb02 Wrong index for /trait remove 2020-12-02 22:16:04 +08:00
fullwall
0b79c392b0 Some plugins rely on specific metadata ordering 2020-11-27 23:31:21 +08:00
fullwall
b4943a0e84 Fix some bugs in straight line targeter 2020-11-27 22:45:13 +08:00
fullwall
2f10ac86cc Avoid caching empty paths 2020-11-24 20:34:22 +08:00
fullwall
4491e95952 Reload holograms with line height change 2020-11-23 07:48:26 +08:00
fullwall
810441c17b Add new setting and implement parameter 2020-11-22 21:29:55 +08:00
fullwall
fb0591c187 Implement new APIs 2020-11-22 21:08:01 +08:00
fullwall
9310dde3f0 Add new navigation strategy without pathfinding 2020-11-20 19:11:26 +08:00
fullwall
353251acc6 Strip colors when checking for text emptiness 2020-11-17 11:39:24 +08:00
fullwall
59d4f7033c Hide nameplates for empty hologram names 2020-11-17 11:36:18 +08:00
fullwall
3c2d0625b4 Clone spawn location more, minor cleanup 2020-11-17 10:15:52 +08:00
fullwall
da5a611014 Add --registry arg to /npc select 2020-11-17 09:12:41 +08:00
fullwall
0add70d397 Add spawnreason to debug 2020-11-17 09:09:52 +08:00
fullwall
e29f05156d Add setLocked to Age 2020-11-17 09:04:24 +08:00
fullwall
1e050bb89d Name Citizens save and load tasks for timings 2020-11-15 20:32:16 +08:00
fullwall
1eddabe8c0 Allow /npc follow to teleport across worlds 2020-11-15 17:43:26 +08:00
fullwall
7743763d3c Refactor common code, add missing condition 2020-11-14 18:41:21 +08:00
fullwall
d3002965fd Cleanup 2020-11-13 10:31:55 +08:00
fullwall
0c36ea04a7 Reset hologram if now empty 2020-11-07 15:10:49 +08:00
fullwall
ba00c91a30 Remove path properly 2020-11-04 16:42:55 +08:00
fullwall
10e1576496 Don't measure distance between worlds 2020-11-03 14:36:44 +08:00
fullwall
55922168d2 1.16.4 initial update 2020-11-03 14:33:34 +08:00
fullwall
9ff38f0080 Make citizens.npc.talk default true 2020-10-27 01:31:18 +08:00
fullwall
e8cdba65df Fix /npc hologram remove off by one 2020-10-26 17:20:09 +08:00
fullwall
cac35409c9 Check for command message setting being empty 2020-10-21 15:18:07 +08:00
fullwall
a944c3ca9c Make mob entity uuids the same as their NPC uuid 2020-10-18 18:32:33 +08:00
fullwall
8cdda471b9 Prevent concurrent modification issue with NPC spawning 2020-10-15 20:30:50 +08:00
fullwall
7dba144924 Use MONITOR priority for NPCSpawnEvent 2020-10-15 20:21:15 +08:00
fullwall
5081b713a8 For completeness, work with stacked waypoints 2020-10-14 15:16:40 +08:00
fullwall
e10af76e45 Showing markers by default 2020-10-14 15:14:49 +08:00
fullwall
10ec4b2c29 Fix conversation abandoned event 2020-10-14 15:12:41 +08:00
fullwall
4f345dddc1 Give an extra block's worth of leeway to /npc path reaching the destination 2020-10-13 21:51:52 +08:00
fullwall
de74b21dd7 Fix up some messages with the waypoint editor 2020-10-13 19:51:53 +08:00
fullwall
306a448a48 Remove editing slot from linear waypoint editor, make showing points the default and adjust messages to explain this 2020-10-13 18:52:45 +08:00
fullwall
c46362b02d Just use the slower but safer remove option 2020-10-12 23:04:12 +08:00
fullwall
9eb254215f Add preventing spawn debug 2020-10-12 22:49:09 +08:00
fullwall
675eaffad5 Prevent chunk load respawning with SpawnReason.PLUGIN 2020-10-12 22:24:44 +08:00
fullwall
12b796afa3 Add extra spawning debug 2020-10-12 21:58:26 +08:00
fullwall
13dee3570f Add messages for chat waypoint trigger 2020-10-12 21:10:49 +08:00
fullwall
4591b9e3a9 Fix rightclicking markers in /npc path 2020-10-12 21:00:23 +08:00
fullwall
6a3382c5ce Insert in proper position 2020-10-12 20:45:47 +08:00
fullwall
1d314fba7a Append waypoints in the waypoint editor 2020-10-12 20:44:11 +08:00
fullwall
b2f841a40e Fix shulker bullets with lookclose on 2020-10-12 14:10:23 +08:00
fullwall
b20113e1f1 Make flying A* use the new iterations per tick settings 2020-10-10 21:40:33 +08:00
fullwall
9e0b8d1c5a Fix hologram names with non-player NPCs 2020-10-08 21:06:45 +08:00
fullwall
38dfb0e42c Looking for the closest block to the ground when targeting entities 2020-10-08 13:26:41 +08:00
fullwall
27b0bc107c Generate getters for trait methods 2020-10-07 19:16:41 +08:00
fullwall
8f009d5598 Add /npc ai command 2020-10-05 15:59:14 +08:00
fullwall
84ec48078d Add global settings for command error messages 2020-10-05 12:18:19 +08:00
fullwall
f5dc673948 Fix /npc command sequential 2020-10-03 15:40:53 +08:00
fullwall
ace484636a Add /npc pathto 2020-09-17 23:31:44 +08:00
fullwall
7450c4db45 Use new getOrAddTrait methodf 2020-09-14 17:57:58 +08:00
fullwall
450bff76ec Fix protect setting for followtrait 2020-09-14 17:39:49 +08:00
fullwall
d334d86f3d Make shulker bullet the default marker type 2020-09-11 16:35:15 +08:00
fullwall
52f8044cd5 Update to 1.16.3 2020-09-11 09:29:42 +08:00
fullwall
11b161e216 Destroy wander markers 2020-09-10 21:23:25 +08:00
fullwall
5d2d6b7e4d Move marker code to sync 2020-09-10 20:48:18 +08:00
fullwall
934f94e137 Add setting for max minecraft pathfinder fall distance 2020-09-05 15:13:34 +08:00
fullwall
7d10e25da5 Fix condition in entityportalevent 2020-08-30 17:00:33 +08:00
fullwall
0a9aaef54e Add setting 2020-08-28 22:55:29 +08:00
fullwall
9f3da308e3 Don't save commands directly to avoid yaml key issues 2020-08-12 23:40:44 +08:00
fullwall
a5d2010c41 Initial 1.16.2 update 2020-08-12 22:21:12 +08:00
fullwall
73250c300a Allow /npc hologram set to add not set 2020-08-11 22:57:32 +08:00
fullwall
45907da2d7 Hologram bugfixes 2020-08-11 22:47:45 +08:00
fullwall
2f6395884a Make /npc tphere center and cursor work consistently 2020-08-10 18:02:35 +08:00
fullwall
21b2908e83 Remove team metadata 2020-08-09 13:04:46 +08:00
fullwall
9d50055d6f Only players can use scoreboard teams at the moment 2020-08-08 22:34:49 +08:00
fullwall
d579fcbb53 Add cursor argument and center flag to /npc tphere 2020-08-03 20:30:50 +08:00
fullwall
d46aad717f Backport boat movement to 1.15 2020-07-27 17:42:30 +08:00
fullwall
8639c0ab27 Add /npc hologram direction 2020-07-27 17:34:07 +08:00
fullwall
2a8f54f2d6 Move movement code into playerTick to avoid inter-world crashes 2020-07-27 17:14:57 +08:00
fullwall
5bfe08ecfb Rudimentary movement strategy for non-living entities 2020-07-27 15:56:42 +08:00
fullwall
e8c57acac1 Add boat movement to 1.16, include ID in default selection message 2020-07-27 10:44:13 +08:00
fullwall
62e44c25ed Armor stands shouldn't have holograms even if the setting is enabled 2020-07-22 01:30:07 +08:00
fullwall
5907c1c8b2 Make /npc tphere include the coordinates it was teleported to 2020-07-22 00:54:49 +08:00
fullwall
be592d1f54 setInvulnerable doesn't exist on old minecraft versions 2020-07-21 20:59:54 +08:00
fullwall
7081002f1f Add some error messages for invalid /npc hologram commands 2020-07-21 11:15:05 +08:00
fullwall
ac9d7035e1 Init anonymous registry list 2020-07-18 21:18:53 +08:00
fullwall
155df40dcb Make getNPCRegistries() return anonymous registries too, make default registry name static 2020-07-18 21:10:55 +08:00
fullwall
c8898b52e3 Add always-use-name-holograms 2020-07-18 19:08:10 +08:00
fullwall
b571debec1 Add -s(ilent) flag to /npc create 2020-07-18 01:00:23 +08:00
fullwall
65aa07a09d Null check 2020-07-17 12:35:36 +08:00
fullwall
b14f0bac9c Redirect left/right clicks for hologram NPCs 2020-07-17 09:52:00 +08:00
fullwall
f973fdde9c Remove unused quickselect setting 2020-07-16 23:55:09 +08:00
fullwall
57373a68a3 Don't teleport if despawned 2020-07-15 23:50:48 +08:00
fullwall
0036c9d6a2 Fix /npc command random 2020-07-15 20:19:43 +08:00
fullwall
4e26f52252 Go back to including metrics directly 2020-07-12 11:49:48 +08:00
fullwall
0feb1462ef Reduce default new finder iterations 2020-07-11 13:14:45 +08:00
fullwall
c60e18bd87 teleport should check cross-world 2020-07-11 00:44:40 +08:00
fullwall
f3986ec9cc Update custom name status immediately on spawn 2020-07-11 00:38:27 +08:00
fullwall
aaa45ea72e Paper seems to prefer despawning immediately 2020-07-10 15:13:53 +08:00
fullwall
0586f2ab89 Vehicles shouldn't use LookAirController 2020-07-10 14:04:53 +08:00
fullwall
429264dbf0 Fix Boolean parsing issue 2020-07-10 12:28:39 +08:00
fullwall
652a68a79d Respect name visibility properly 2020-07-10 12:19:29 +08:00
fullwall
44b6da408d Simplify marker removal 2020-07-09 23:43:27 +08:00
fullwall
ea20cdb21e Fix duplication of name hologram 2020-07-09 23:37:45 +08:00
fullwall
cb676c4b19 Implement new event 2020-07-08 23:52:42 +08:00
fullwall
b5e59585e3 If NPC is already despawned count that as a valid despawn 2020-07-08 19:26:00 +08:00
fullwall
202c2487a6 Allow selecting by NPC uuid (global) 2020-07-08 12:18:49 +08:00
fullwall
3ecd3300ce Add location cloning to setTarget and Waypoint 2020-07-07 22:22:34 +08:00
fullwall
29e6e20feb Add /npc hologram clear 2020-07-07 01:07:01 +08:00
fullwall
ed141532a8 Don't store hashcode goal selector 2020-07-06 23:28:14 +08:00
fullwall
002b2b61ff Also cancel push event if not collidable 2020-07-06 21:48:57 +08:00
fullwall
c68ba08f9d Fix missing change 2020-07-06 21:27:48 +08:00
fullwall
0a58215541 Use holograms instead of scoreboard for names 2020-07-06 16:37:34 +08:00
fullwall
d333c98823 Refactor getHeight for NMS 2020-07-06 08:42:46 +08:00
fullwall
942b354967 Fixes for /npc hologram, add /npc command random 2020-07-03 22:59:18 +08:00
fullwall
878263359a Flesh out hologram impl more 2020-07-03 15:14:55 +08:00
fullwall
ae0c3b7a6b Update /npc text help 2020-07-02 12:30:00 +08:00
fullwall
9d2cad098a Implement new bounding box checker for pathfinding 2020-06-30 20:39:40 +08:00
fullwall
381f303023 Add very basic /npc hologram command 2020-06-30 18:17:14 +08:00
fullwall
05cc8de3c7 Implement /npc command cost 2020-06-30 15:20:02 +08:00
fullwall
82bdbe31c1 Fix condition negation 2020-06-29 23:09:18 +08:00
fullwall
79eab9135b Null check poses trait 2020-06-29 18:05:48 +08:00
fullwall
0ee8c63a66 Remove debug 2020-06-29 18:02:30 +08:00
fullwall
0293ac17df Add default poses 2020-06-29 15:32:37 +08:00
fullwall
c7ab1a8407 Copy getStoredLocation/getLocation 2020-06-28 18:05:04 +08:00
fullwall
d8b3b1c2c0 Add event to spawning debug 2020-06-28 17:36:24 +08:00
fullwall
c9564c4be2 Implement enderman methods 2020-06-27 15:41:47 +08:00
fullwall
59cefadeda Add /npc enderman 2020-06-27 15:41:22 +08:00
fullwall
99c7155a7a Make debug-mode show /npc skin exception 2020-06-27 10:52:54 +08:00
fullwall
2cb61039eb Implement new event 2020-06-26 20:51:50 +08:00
fullwall
19013fc94f Allow equipping netherite gear in /npc equip 2020-06-26 14:26:10 +08:00
fullwall
d6df589b23 Implement new event 2020-06-26 12:16:13 +08:00
fullwall
04519d868b Initial 1.16 commit 2020-06-25 17:24:32 +08:00
fullwall
02e68de7c7 Add error message if item in hand pattern not specified 2020-06-23 20:38:19 +08:00
fullwall
869e787fea Update disableteleporting message id 2020-06-15 21:20:10 +08:00
fullwall
2a131102df Check for range equality in random lookclose 2020-06-13 00:18:59 +08:00
fullwall
50218336c5 Remove debugging 2020-06-12 21:18:52 +08:00
fullwall
c5bcfdc8cd Reformat 2020-06-12 20:02:48 +08:00
fullwall
a591089d3c Add debug for /npc command 2020-06-12 19:35:30 +08:00
fullwall
bcf932d616 Add message about cycle parameter 2020-06-12 19:31:36 +08:00
fullwall
daa4d3cc25 Add linear waypoint cycling 2020-06-12 19:29:28 +08:00
fullwall
67510c43a5 Add missing permission error to /npc command --permission 2020-06-11 23:31:14 +08:00
fullwall
0693cd3bfc Change /npc command --permissions 2020-06-11 23:19:24 +08:00
fullwall
40bf7444dd Add some detailed help for /npc command 2020-06-11 16:47:55 +08:00
fullwall
244496dca3 Fixes for /npc command sequential 2020-06-11 16:23:48 +08:00
fullwall
1fd6ccbad9 First pass of /npc command sequential 2020-06-11 02:24:03 +08:00
fullwall
500e8527e1 Reorder player update task adding 2020-06-08 16:30:13 +08:00
fullwall
fd14197175 Account for negative max players 2020-05-28 22:34:12 +08:00
fullwall
ef03e224c2 -o implies -p in /npc command 2020-05-21 18:36:59 +08:00
fullwall
df5ed08e32 Add /npc waypoint add 2020-05-16 16:22:15 +08:00
fullwall
4633b75c24 Use new util method 2020-05-15 12:26:21 +08:00
fullwall
d484432f83 Call left click event for vehicles 2020-05-13 13:23:59 +08:00
fullwall
0b922011bd Rework tablist for recent versions 2020-05-12 23:12:39 +08:00
fullwall
5e2a7efb9e Revert view distance tracking code 2020-05-12 22:33:54 +08:00
fullwall
0498353751 Update tablist after teleport 2020-05-12 22:13:22 +08:00
fullwall
c1a89984a3 Rework mounted pathfinding 2020-05-12 20:28:41 +08:00
fullwall
c2467b7a25 Adjust horse pathfinding 2020-05-12 16:48:21 +08:00
fullwall
cc14768607 New finder now sets the passenger movement for horses 2020-05-11 20:36:35 +08:00
fullwall
03064a55f5 Increase read timeout of /npc skin --url 2020-05-11 14:15:48 +08:00
fullwall
c79c3cbf88 Add missing messages in waypoint commands 2020-05-10 22:29:34 +08:00
fullwall
bb0aedff0c Prevent concurrent modification of player list 2020-05-10 18:42:58 +08:00
fullwall
10cea99af1 Disable milking protected NPC cows 2020-05-09 22:15:22 +08:00
fullwall
aa0752f7a2 Change /npc sound -s to a toggle and make -d reset silent to false 2020-05-08 13:36:58 +08:00
fullwall
3cf8c7c256 Fix bug with /npc snowman /npc pufferfish and make /npc ocelot more descriptive 2020-05-07 16:29:45 +08:00
fullwall
c72016046b Fix player movement speed and add iterations per tick setting for new pathfinder 2020-05-06 18:08:12 +08:00
fullwall
e89cd03cce Fix bug with /npc command --n 2020-05-05 21:53:12 +08:00
fullwall
41a3673a9f Make /npc pathopt more usable 2020-05-05 18:40:58 +08:00
Alex "mcmonkey" Goodwin
30f2dee4d7
Reduce potential for errors with packet teams (#2138) 
* Reduce potential for errors with packet teams

Move scoreboard removal out of NMS to event method, and make more unique names

* remove unneeded isCancelled check
 2020-05-05 18:20:56 +08:00
fullwall
92d3605e30 Change default talk item to * 2020-05-05 15:48:35 +08:00
fullwall
071225bcb9 Revert previous change 2020-05-04 21:10:47 +08:00
fullwall
e6cf9b8b08 Clean up multiworld permission check for /npc tphere and don't respawn NPCs who were spawned for another reason 2020-05-04 16:21:34 +08:00
fullwall
a9ddebd8f8 Controllable should allow donkeys/mules to use horse physics, and delay skin respawning by a tick 2020-05-04 16:09:07 +08:00
fullwall
9a4c8e73c2 Micro optimisation 2020-05-03 02:06:33 +08:00
fullwall
5bb346e8c9 Remove cache persistence logic 2020-05-03 00:16:16 +08:00
fullwall
ba31206a4c Add path caching to linear waypoint provider 2020-05-03 00:13:29 +08:00
fullwall
a1744f0e35 Prettify /npc command output a little bit 2020-05-01 20:07:22 +08:00
Alex "mcmonkey" Goodwin
2c24671ae3
simplify scoreboard patch to be 100% packet based (#2129) 
* simplify scoreboard patch to be 100% packet based

which fixes edge case client errors

* fix edge cases of respawning and multinpc boards
 2020-05-01 17:49:25 +08:00
fullwall
16c418415b Cleanup, reduce number of packets per packet update cycle 2020-05-01 17:49:03 +08:00
fullwall
a2208f0d32 Minor style changes 2020-05-01 01:47:07 +08:00
Alex "mcmonkey" Goodwin
981ade8974
patch the majority of potential scoreboard packet errors (#2128) 2020-05-01 01:39:07 +08:00
fullwall
27f417113a Simplify CitizensNPCRegistry 2020-05-01 00:51:05 +08:00
fullwall
01b3dbfd33 PlayerUpdateTask should now be run on 1.8.8 2020-05-01 00:40:27 +08:00
fullwall
2b94ad8959 Minor cleanup 2020-05-01 00:26:17 +08:00
fullwall
f33c745e19 Add controllable ground direction modifier setting 2020-04-30 23:45:06 +08:00
fullwall
8336fe1b7c Fix load bug in body yaw 2020-04-30 23:11:45 +08:00
fullwall
521c1d3fda Add /npc command permissions for temporary permissions during the command 2020-04-30 21:32:38 +08:00
fullwall
12ffd56981 Add delay argument to /npc command and add a builder-style API for creating new commands 2020-04-30 21:15:24 +08:00
Alex "mcmonkey" Goodwin
0e31ffb9f8
Implement packet-based scoreboard team enforcement (#2127) 
* Implement packet-based scoreboard team enforcement

This should fix incompatibility with scoreboard plugins that break the main scoreboard

* impl to 1.8-1.12, move event logic, fix Setting usage

* pull setting if to outside of foreach loop

* fix return vs continue, minor opti as requested
 2020-04-30 20:51:10 +08:00
fullwall
8109a90440 Fix saving of body vs head yaw 2020-04-30 19:11:56 +08:00
fullwall
32429f140d Run clientside player ticking at a different time 2020-04-29 20:56:39 +08:00
fullwall
bbf3f281eb Fix portal removal timing 2020-04-29 19:18:16 +08:00
fullwall
d5667e53f5 Use new API 2020-04-26 12:53:00 +08:00
fullwall
dc72f7526c Support bungee /server command in Citizens command 2020-04-25 19:10:49 +08:00
fullwall
fe8eb4e85d Change how npc looking works 2020-04-25 16:57:31 +08:00
fullwall
f9b0397cab Add --eid option to /npc remove 2020-04-22 23:46:36 +08:00
fullwall
a360810e8d Pre-filter chunk unload entities 2020-04-22 20:25:17 +08:00
fullwall
4bbe797120 QoL change for /npc glowing --color to enable if not previously enabled 2020-04-22 18:00:15 +08:00
fullwall
5e431462e0 Try to remove any previous wander goals 2020-04-22 00:27:25 +08:00
fullwall
000fc19a40 Clear PhTree before recalculation 2020-04-22 00:24:18 +08:00
fullwall
2383e8f551 Further reduce default controllable speed 2020-04-21 23:04:39 +08:00
fullwall
655bdf0001 Change how NPC looking works so that body yaw matches head yaw after a tick 2020-04-21 22:24:13 +08:00
fullwall
06d8e92ff2 Cancel right click event if NPC has talked to someone 2020-04-20 21:44:50 +08:00
fullwall
0531fe859e Implement new AI API for Minecraft 1.15.2, fix Squids 2020-04-20 17:38:56 +08:00
fullwall
725adb009f Cast command cooldowns manually 2020-04-20 00:54:35 +08:00
fullwall
341f7b1990 Incorporate speed modifier into forward controllable speed and boost left/right speed 2020-04-19 18:07:49 +08:00
fullwall
0a8736b690 Add some basic javadoc to SkinTrait 2020-04-19 02:43:08 +08:00
fullwall
2c1ef04614 Migrate /npc skin properly and deprecate skinnable entity methods 2020-04-19 02:13:00 +08:00
fullwall
93af872e93 Ensure /npc skin works while not spawned 2020-04-19 02:09:46 +08:00
fullwall
80011eed41 Revamp SkinnableEntity into SkinTrait 2020-04-19 02:07:03 +08:00
fullwall
9090d1c69b Fix lookclose target invalidation 2020-04-19 01:28:40 +08:00
fullwall
ecae2dbe8a Make wander goal more random 2020-04-19 01:22:55 +08:00
fullwall
b546afa368 Better default skin name detection 2020-04-18 12:31:27 +08:00
fullwall
aaa6397a69 Add new API to avoid default skin fetching 2020-04-18 12:24:29 +08:00
fullwall
c63b6efdf7 Fix NPE in Enderman Equipper 2020-04-16 18:31:45 +08:00
fullwall
d13530ff49 Ensure commands run on main thread 2020-04-16 03:04:42 +08:00
fullwall
b26540619b Merge branch 'master' of github.com:CitizensDev/Citizens2 2020-04-15 04:20:38 +08:00
fullwall
e288bd934c Fix NPE in linear waypoint editor 2020-04-15 04:20:21 +08:00
Tom Miller
fe024923cf
We can optimize a significant portion of LookClose's findNewTarget method with some changes: (#2103) 
-Build the list of all potential Players and THEN sort by distance. A good chunk of the method's time was spend sorting things it didn't need to.
-Second, reorder the player checks for best performance, where getNPC() is the cheapest check and isPluginVanished is the most expensive check.

In somewhat minimal testing, these changes almost dropped findNewTarget off of my profiling entirely
 2020-04-14 01:57:20 +08:00
fullwall
09f7cbb9d5 Use chunk.getEntities on chunk unload 2020-04-13 21:56:48 +08:00
fullwall
14ebf26935 Try to avoid water more 2020-04-08 23:59:49 +08:00
fullwall
ba13f6c389 Use raw chat messages to perform commands 2020-04-08 23:19:59 +08:00
fullwall
275728e65b Fix cat lying down, remove dead code 2020-04-02 13:28:42 +08:00
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