Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-03 09:21:13 +01:00
Code Issues Projects Releases Wiki Activity
2,039 Commits 6 Branches 0 Tags 105 MiB
c79c3cbf88
Commit Graph

332 Commits

Author SHA1 Message Date
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
f28ccb550b Include C-API javadoc 2019-05-12 20:48:17 +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
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
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
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
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
0cbf22a944 Stop double execution stop 2018-10-29 22:33:41 +08:00
fullwall
44ee5a2bfe Update helmets 2018-10-27 01:18:11 +08:00
fullwall
3c1975f1df Update for 1.13.2 2018-10-25 16:48:15 +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
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
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
fullwall
184b414dd5 Minor microoptimisation 2018-04-09 17:41:53 +08:00
fullwall
74989cd93e Fix typo 2018-04-09 00:26:16 +08:00
fullwall
772ab5fb7b Add NMS.setPeekShulker to replace old method 2018-04-09 00:17:17 +08:00
fullwall
4c99dc0e7c Initial 1.8.8 support 2018-04-07 16:02:35 +08:00
fullwall
09666bfb8a
Update ShulkerTrait.java 2018-04-03 10:50:36 +08:00
fullwall
4da3153cdd Fix shulker color and playing sounds 2018-03-26 14:39:28 +08:00
fullwall
33568b24c2 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-03-26 12:06:38 +08:00
fullwall
4b95ebb427 Properly validate shulker color in command 2018-03-26 12:06:20 +08:00
mcmonkey4eva
ec8a16c30b ( Patch for #1453 ) proper wolf command output 
"i" flag is left in as a way to get info output but not actually checked (as info output should also appear if changes are made)
 2018-03-23 04:34:51 -07:00
mcmonkey4eva
acb50f6a50 ( Patch for #1455 ) reload saves rather than reconstructing 2018-03-23 03:13:51 -07:00
fullwall
f8a8a19b9c Allow /npc mount --onnpc to work in console 2018-03-19 15:02:07 +08:00
fullwall
f03a376db5 Add a preliminary wanderable regions mode to the wander waypoint provider 2018-03-15 18:25:24 +08:00
fullwall
fd7b6c6fbf Add new pathfinder maximum iterations setting 2018-03-15 16:46:57 +08:00
fullwall
5f062dbb3a Fix horse/llama equipping 2018-03-15 16:41:30 +08:00
fullwall
680af76457 Make the new pathfinder go through door corners instead of the middle of the door to avoid getting caught 2018-03-15 15:46:10 +08:00
fullwall
32e71968e0 Add new permissions nodes to plugin.yml 2018-03-15 15:22:20 +08:00
fullwall
9c3fb30623 Do some cleanup of WaypointMarkers to be more generic 2018-03-10 23:34:42 +08:00
fullwall
73ff01c774 Add color to /npc shulker 2018-03-09 23:30:28 +08:00
fullwall
dd53b5eefa Remove possible NPE from trait plotting 2018-03-09 22:33:09 +08:00
fullwall
3fafa7a255 Update skins to be persistent by default (this is retroactive) - use /npc skin -l instead for continuously updating skins 2018-03-09 22:15:26 +08:00
fullwall
9ac4ef3feb Fix NPE 2018-03-09 21:31:29 +08:00
fullwall
a897709c34 Let /npc text exit the text editor 2018-03-09 21:28:21 +08:00
fullwall
147a3e4c26 Fix TeleportWaypointTrigger 2018-03-09 21:13:05 +08:00
fullwall
d7237dff4e Prevent potion effects for protected NPCs 2018-03-09 20:54:20 +08:00
fullwall
fc9f813f18 Modernise LookClose a little 2018-03-09 20:07:08 +08:00
fullwall
30ef5de8e0 Fix vehicle enter prevention not working properly 2018-03-09 19:29:59 +08:00
fullwall
a8fe35a19d Implement SwimmingExaminer 2018-03-09 18:36:43 +08:00
fullwall
01f00960d7 Change /npc wolf to be toggle-based instead of clearing the command and make /npc ocelot throw an exception instead of doing nothing silently 2018-03-09 17:28:20 +08:00
fullwall
5a1eadb64a Commit some messages that were missing 2018-03-09 16:46:23 +08:00
fullwall
a787465c29 Add error message when a skin name is missing from /npc skin 2018-03-09 16:41:01 +08:00
fullwall
1bc5a47ae8 Use stored location in EntityDeathEvent 2018-02-18 18:41:22 +08:00
fullwall
ffbeedfccd Allow setting of text talk delay per-NPC 2018-02-15 23:29:11 +08:00
fullwall
72ac9134b1 Allow minecraft to remove NPCs on death instead of going through Citizens 2018-02-13 17:18:15 +08:00
fullwall
476debfcd7 Make horse equipper more general 2018-02-03 08:56:09 +08:00
fullwall
f33804609e Add -l flag to /npc spawn and add /npc metadata 
Add /npc remove --owner
 2018-01-01 14:41:10 +08:00
fullwall
47ef30639a Trial some changes to skin fetching to cut down on requests when persistent skins are in use 2017-10-20 00:42:25 +08:00
fullwall
ffbedcd841 Implement a rudimentary setSkinPersistent API 2017-10-19 00:27:27 +08:00
fullwall
636cd7eff7 Only set shulker peek on spawn and on change 2017-09-05 14:03:42 +08:00
fullwall
15569c529f Add /npc shulker 2017-09-04 19:16:49 +08:00
fullwall
0e25c352a0 Try to aggressively stub out AdvancementDataPlayer 2017-08-24 19:50:04 +08:00
fullwall
8bd543c035 Don't look at invisible players in LookClose 2017-08-22 20:44:29 +08:00
fullwall
20306de9a3 Use contains for equipment editing commands 2017-08-22 20:30:29 +08:00
fullwall
eb5ca54807 Increase y velocity for flyable NPCs 2017-06-09 20:31:43 +08:00
fullwall
9f291dfec2 Add parrot command, fix 1.12 bug in players 2017-06-08 19:19:04 +08:00
fullwall
8145751136 Bump version, first pass at 1.12 2017-06-02 17:36:25 +08:00
fullwall
5552bff4cf Fix /npc age for zombies 2017-04-03 01:18:13 +08:00
fullwall
7e6cf4f7cd Improve waypoint triggers 2017-02-28 21:36:10 +08:00
fullwall
f65d87c2db Fix some bug 2017-02-10 18:16:28 +08:00
fullwall
2c8ac01aea Check world in navigator 2017-02-05 21:37:39 +08:00
fullwall
49c6d3cbed Add basic editor for wander waypoints 2017-01-21 17:32:53 +08:00
fullwall
226470d743 Fix wither crash 2017-01-17 16:08:33 +08:00
fullwall
a8376242bc Remove secondary skin cache for /npc skin 2017-01-07 13:55:19 +08:00
fullwall
59f67c02b9 Add /npc llama 2016-12-27 00:38:59 +08:00
fullwall
f7a4e78a8c Don't update controller look during navigation 2016-12-24 21:22:11 +08:00
fullwall
e1dda0499c Check Citizens plugin disabled in skinpackettracker 2016-12-17 12:22:23 +08:00
fullwall
cf5beab4c5 Add immediate parameter to Util.faceLocation and fix a bug in it 2016-12-16 17:03:11 +08:00
fullwall
1bd3b7e0e8 Don't use empty scoreboard team names 2016-12-14 16:26:19 +08:00
fullwall
afb7e13ee6 Fix some issues with controllable 2016-12-11 17:12:29 +08:00
fullwall
e3981a15a6 Implement debug NavigatorParameter and change some Player yaw code 2016-12-10 19:53:55 +08:00
fullwall
9df3481a9b Check for exceptions 2016-12-06 21:15:45 +08:00
liec0dez
5c88de7783 Trait fix for proper UUID serialization and functionality when NPCs appear in different order 2016-12-03 22:13:04 +01:00
liec0dez
aabc85f177 Trait fix for proper UUID serialization and functionality when NPCs appear in different order 2016-12-03 22:08:16 +01:00
fullwall
2442e24255 Make MountTrait more reliable by making the NPC leave its vehicle on despawn 2016-12-04 02:16:25 +08:00
fullwall
e68e9ad5c6 Update passenger yaw in navigation (issue #994) 2016-12-02 20:08:56 +08:00
fullwall
d47a7e88ad Improve MountTrait 2016-12-02 19:32:25 +08:00
fullwall
7cd3e6d78f Controllable should use LookAirController for non-LivingEntity NPCs 2016-12-01 19:48:47 +08:00
mcmonkey4eva
c4f5c2f727 Correct despawn/removal order for compatibility 
Version 2, the "don't include formatting fixes for some reason" edition
 2016-12-01 03:40:34 -08:00
fullwall
f2879fbfcc Fix players always looking south 2016-11-30 14:17:01 +08:00
fullwall
bc9374d30c Remove villager force head yaw setting 2016-11-26 23:42:23 +08:00
fullwall
002d7b71d2 Fix entities looking at feet instead of eyes 2016-11-26 22:38:14 +08:00
fullwall
deffc24bb7 Fix NPE, add MountTrait, fix 1.10 looking 2016-11-26 11:28:29 +08:00
fullwall
07a3aeabad Forward the rest of the RegistryMaterials methods and fix player looking 2016-11-25 19:29:59 +08:00
fullwall
b695afdcd5 Fix mob NPC not using pitch 2016-11-22 16:04:48 +08:00
fullwall
2f7e4ea786 Add -h option to /npc name 2016-11-22 15:41:51 +08:00
fullwall
765c42cb45 Modify EntityTypes hooks to be less invasive 2016-11-22 01:00:52 +08:00
fullwall
fc43e6aa12 Make VehicleEnterEvent check horse-type agnostic 2016-11-17 17:18:51 +08:00
fullwall
ef0bc3d4e7 Force skin update on /npc skin 2016-11-17 17:10:38 +08:00
fullwall
dccfadb846 Fixes for 1.11 2016-11-17 17:00:16 +08:00
fullwall
0189157400 First pass at 1.11 2016-11-17 15:53:41 +08:00
fullwall
0c833e2566 Increase player NPC skin update delay on join to possibly help Bungee 2016-10-02 21:32:10 +08:00
fullwall
14cd243d6a Don't add waypoint markers to the main registry 2016-09-09 01:32:10 +08:00
fullwall
5f473ee4cd Small fixes 2016-09-07 18:05:06 +08:00
fullwall
97feb5390e Only pathfind on update 2016-09-05 19:23:18 +08:00
fullwall
b5c433c594 Check pathfinding range while pathfinding 2016-09-05 19:13:01 +08:00
fullwall
417f0f1691 Add missing toLowerCase call in trait factory 2016-08-30 18:32:14 +08:00
fullwall
7cb434db21 Small optimisations 2016-08-25 19:40:58 +08:00
fullwall
2dab3d338d Null check signature 2016-08-24 22:15:13 +08:00
fullwall
95261e4548 Unchange where tracker replacement happens 2016-08-21 21:53:08 +08:00
fullwall
e344158ff4 Change where tracker replacement happens 2016-08-20 13:38:04 +08:00
fullwall
d9f31ffc84 Remove zombie-specific profession from VillagerProfession 2016-08-19 21:49:28 +08:00
fullwall
73854b8107 Remove debugging code and make vehicle enter blocked for boats/minecarts if Controllable is not enabled 2016-08-19 21:47:44 +08:00
fullwall
c0a3f0b1de Implement new API 2016-08-08 17:26:27 +08:00
fullwall
2fc1005d68 Fix build 2016-08-03 19:38:45 +08:00
fullwall
449a7bd46a Convert to multi module 2016-08-03 19:19:24 +08:00