Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-02 15:43:54 +01:00
Code Issues Projects Releases Wiki Activity
1,094 Commits 6 Branches 0 Tags 106 MiB
8d14e90ef6
Commit Graph

853 Commits

Author SHA1 Message Date
fullwall
c538a18471 Set pathfinding range on strategy switch 2013-10-20 00:11:53 +08:00
fullwall
7229958dcf Merge branch 'master' of https://github.com/CitizensDev/Citizens2 2013-10-17 15:28:06 +08:00
fullwall
10ba87e552 Ignore cancelled right click events 2013-10-17 15:27:53 +08:00
Jeremy Schroeder
8149d1cfff Don't add 1 to y-axis when using -c modifier for /npc anchor. 2013-10-15 21:07:59 -04:00
Jeremy Schroeder
6d30964c75 Formatting to Pose toString(), add 1 block in the y-axis to '/npc anchor --add name -c' to avoid NPCs having anchors waste-deep. Have /npc anchor show anchors which are 'currently unloaded'. 2013-10-15 20:57:41 -04:00
Jeremy Schroeder
d2fa637d7d Allow anchors for locations in worlds which are currently not loaded. 2013-10-15 20:56:20 -04:00
Jeremy Schroeder
d88215c563 Fix SpeechController 'Chat' VocalChord when talkign with multiple entities. 2013-10-15 20:54:58 -04:00
Olof Larsson
2819da6678 Add missing permission nodes for a few traits. 
I missed a few traits when creating permission nodes in my previous pull request. In this pull request I have added the missing ones by taking a look in the class "net.citizensnpcs.npc.CitizensTraitFactory".

Signed Off By: Olof "Cayorion" Larsson
 2013-10-03 12:06:11 +02:00
Olof Larsson
ccce8a249a Superperms compliant plugin.yml. Fixes CITIZENS-705. 
In this commit I have registered all permissions used in the source code. I have also manually created all applicable wildcard (.*) nodes. By doing this no external
permission manager plugin is required. Additionally external permission managers that are superperms based will now work without bugs.

This commit is 99% backwards compatible current server configurations. The only change made to the nodes is the removal of underscores in citizens.npc.controllable.*
permissions. This change was made to achieve consistency with citizens.npc.create.* permissions.

Signed Off By: Olof "Cayorion" Larsson
 2013-10-03 03:02:46 +02:00
fullwall
cac5a5387d Fix some bugs in the new guided finder based on testing with Jeebiss 2013-10-03 00:00:36 +08:00
fullwall
d59cdddc2f Remove some usage of deprecated calls 2013-10-01 22:14:03 +08:00
fullwall
b8b89c43a5 Rename JeebissFinder to Guided and make it work 2013-10-01 12:16:20 +08:00
fullwall
42172100ab Work on new waypoint provider 2013-09-26 23:55:12 +08:00
fullwall
002cf97913 First pass at 1.6.4 2013-09-21 00:01:39 +08:00
fullwall
0f0e108950 Send location update packets every so often 2013-09-18 10:23:33 +08:00
fullwall
815733c2ad Breaking change: add new registry param to CitizensNPC constructor 2013-09-11 22:27:24 +08:00
fullwall
50a43d6116 Reorder highest/lowest calculations - may fix issues with using remove() 2013-09-10 23:55:58 +08:00
fullwall
c25a747500 Remove PlayerEntitySenses workaround 2013-09-02 12:04:45 +08:00
fullwall
8ef0d56bb3 New pathfinder no longer considers diagonals 2013-09-01 21:47:38 +08:00
fullwall
d7b50e17ae Don't call bukkitEntity.teleport too early for player entities 2013-08-23 20:51:58 +08:00
fullwall
2624eea3b1 Remove NPCVehicleExitEvent 2013-08-18 14:04:15 +08:00
fullwall
57ead921a2 Allow Conversable rather than Player in SelectionPrompt 2013-08-16 12:12:17 +08:00
fullwall
9fc7c43ea5 Call NPCVehicleExitEvent properly for all vehicle exits 2013-08-15 17:23:36 +08:00
fullwall
bc5704128a Trim name length to 16 chars not 15 2013-08-14 22:53:00 +08:00
fullwall
c4703e1f62 Call NPCVehicleExitEvent for controllables, possibly fix a despawn/respawn bug 2013-08-13 12:20:57 +08:00
fullwall
ef503120fa Possible fix and optimisation for PlayerEntitySenses 2013-08-12 17:32:16 +08:00
fullwall
0ce5eaeafe Add citizens.npc.trait.* permission 2013-08-11 13:27:47 +08:00
fullwall
ad3e73c384 Call new event 2013-08-11 12:27:54 +08:00
fullwall
5c4af2f4b9 add /npc controllable -y | -n 2013-08-11 12:20:15 +08:00
fullwall
4b6191b705 Eject player on quitting when mounted on an NPC 2013-08-10 20:32:30 +08:00
fullwall
2b0e7af138 Prevent NPE in moveto if NPC is not spawned 2013-08-10 18:03:20 +08:00
fullwall
5a3f616fe1 Improve Util#matchEntityType to check for an exact match first 2013-08-08 18:21:35 +08:00
fullwall
5df6499dae Allow /npc remove to ignore the ownership requirement when called from console 2013-08-07 23:39:26 +08:00
fullwall
7d7f6b5415 Try to use backing MC id-mapping - may help with MCPC/Forge 2013-08-06 00:00:02 +08:00
fullwall
e91261355d Check for ID mapping null 2013-08-05 23:20:22 +08:00
fullwall
fbbfd8ef6a Clone location in CurrentLocation 2013-08-05 14:07:18 +08:00
fullwall
3e8f888326 Clone destination location in spawn(Location) 2013-08-05 13:03:19 +08:00
fullwall
e68f4d2643 Fix HorseEquipper 2013-08-04 23:23:08 +08:00
fullwall
cfcd046d4e Allow /npc remove to be used by the server 2013-08-03 20:57:56 +08:00
fullwall
d568dfb886 Add HorseEquipper 2013-08-03 18:33:32 +08:00
fullwall
5ed44829a8 Remove usages of Entity#teleport 2013-08-03 11:01:09 +08:00
fullwall
93495a9ab9 Use the root vehicle for NPC#teleport 2013-08-02 15:14:58 +08:00
fullwall
59af96c467 Implement NPC#teleport (untested) 2013-08-02 15:04:06 +08:00
fullwall
8457671a6e Use default strategy if the attack strategy returns false 2013-08-02 13:49:53 +08:00
fullwall
7911d70c73 Default use-new-finder to false 2013-07-31 18:42:00 +08:00
fullwall
7dad81c6ed Fix bounds check in ByIdArray 2013-07-31 18:41:09 +08:00
fullwall
2603c3ae2c Fix 'reached end of stream for null' 2013-07-31 14:23:08 +08:00
fullwall
aa353d44e6 Remove HelpCommand, Paginator 2013-07-31 13:38:32 +08:00
fullwall
53c975cce8 Extend horse modifiers to save saddle and armor 2013-07-30 11:15:51 +08:00
fullwall
8fd93f82af Move load method up 2013-07-30 00:09:45 +08:00
fullwall
6c153be66c Perhaps fix the reached end of stream messages in log 2013-07-30 00:04:25 +08:00
fullwall
7fdbc95b67 Add max-text-range setting defaulted to 500 2013-07-29 23:51:00 +08:00
fullwall
4bff8784d3 Implement new helper methods 2013-07-28 22:13:51 +08:00
fullwall
0a155a7d10 Fix /npc spawn without an NPC selected and /npc spawn with manual location 2013-07-27 17:58:40 +08:00
fullwall
29ba808908 Match enums with spaces in them 2013-07-27 14:23:59 +08:00
fullwall
383602ba83 Minimum respawn delay of 2 2013-07-24 22:46:43 +08:00
fullwall
e75227d0cd Fix NPE 2013-07-20 16:22:46 +08:00
fullwall
d030909524 Fix Enderman, Horse and Wither not moving properly, fix Player NPCs not jumping properly 2013-07-19 15:22:36 +08:00
fullwall
fdadd1df8b Add /npc targetable and update tab list name based on removefromplayerlist setting 2013-07-18 18:48:57 +08:00
fullwall
dfc7f7e553 Implement the defaultAttackStrategy 2013-07-18 00:22:49 +08:00
fullwall
0f156caf6a Make sure that players are removed from the playerlist every so often 2013-07-16 23:29:11 +08:00
fullwall
705c894c7c Update version incompatible version to be more clear 2013-07-15 19:58:30 +08:00
fullwall
99c32d932f Implement /npc respawn command 2013-07-14 17:28:35 +08:00
fullwall
e1e05c6728 Print the root cause of any exceptions while updating NPCs 2013-07-14 16:38:06 +08:00
fullwall
e21d6daf48 Remove Util#parseLocation 2013-07-14 13:47:57 +08:00
fullwall
ff50cd761d Locations are mutable, fix toggle path altering the waypoints 2013-07-12 21:09:45 +08:00
fullwall
2d973e7575 Add PlayerAnimation#CRIT and MAGIC_CRIT 2013-07-12 20:32:10 +08:00
fullwall
870825d212 Add /npc horse, /npc ocelot, make /npc wolf persist 2013-07-11 12:29:46 +08:00
fullwall
26d79436d7 Work around traits removing themselves or adding traits during onSpawn iteration 2013-07-10 17:35:20 +08:00
fullwall
d0d2f0fc1f Set player position before and after 2013-07-10 00:14:38 +08:00
fullwall
fd51c577ce Remove leash if leashable is false in entities 2013-07-10 00:08:19 +08:00
fullwall
c7057656a3 Add leashable command 2013-07-09 22:01:00 +08:00
fullwall
9b8bef597d Add /npc copier command 2013-07-09 18:07:37 +08:00
fullwall
54eb4e31da Allow 50,000 iterations of A* 2013-07-09 15:21:23 +08:00
fullwall
3e1a15e347 Catch throwable 2013-07-09 12:36:29 +08:00
fullwall
7f6251b709 Don't fail to spawn if a trait has an exception when onSpawn() is called 2013-07-09 12:17:57 +08:00
fullwall
e370fedd3c 1.6.2 2013-07-09 11:32:55 +08:00
fullwall
bfe891495a Fix speed modifier for players 2013-07-07 15:57:21 +08:00
fullwall
af40da3c0e Respect plugin setting of useNewPathfinder better 2013-07-07 13:39:49 +08:00
fullwall
3c08d3c5b6 Fix mistranslated field 2013-07-06 12:04:11 +08:00
fullwall
65bb8f202a Implement new parameter, default USE_NEW_PATHFINDER to true 2013-07-06 12:02:17 +08:00
fullwall
01ede533f8 Fix default pathfinding range and updating pathfinding range 2013-07-05 15:44:18 +08:00
fullwall
a381c3e12d Test 2013-07-05 13:59:13 +08:00
fullwall
c98162c20d Change navigation back to MC navigation and fix duplicate NPCs clientside 2013-07-05 13:46:39 +08:00
fullwall
1ebbe6fe64 Fix server crash 2013-07-03 18:34:53 +08:00
fullwall
6e5f77be62 Fix player line of sight checking and make the A* targeting more robust (10 retries before cancelling target) 2013-07-03 18:29:57 +08:00
fullwall
350a63f0b8 Validate target NPC in /npc tp 2013-07-03 18:05:18 +08:00
fullwall
676d2658dd New way to move air controllable NPCs - hold space to ascend, right click air to descend 2013-07-03 17:51:44 +08:00
fullwall
ea85682d67 Fix entity speeds, targeting 2013-07-03 17:24:00 +08:00
fullwall
fe1956a5fa Test for wolv 2013-07-03 16:44:33 +08:00
fullwall
5b1a73f4d8 Fix target in navigation 2013-07-03 16:38:08 +08:00
fullwall
a064a28aab More cleanup, fix mistranslated field breaking head yaw for players 2013-07-03 14:21:30 +08:00
fullwall
9c4b0f41d2 Clean up jump implementation and remove left click to jump 2013-07-03 14:08:13 +08:00
fullwall
b6b160e99b Ground controllable NPCs can now jump using spacebar 2013-07-03 13:50:34 +08:00
fullwall
fde461489a Fix controllable NPCs and add -m flag to instamount 2013-07-03 12:36:52 +08:00
fullwall
c6e9cfa58a Fix Navigation for non-new AI NPCs - thanks kumpelblase2 2013-07-03 11:38:27 +08:00
fullwall
df97053e91 Preliminary update to MC 1.6.1: NOTE THAT PLAYER PATHFINDING DOES NOT WORK FULLY YET 2013-07-03 11:31:52 +08:00
fullwall
73ec77eaa0 Call new NPCDataStore method 2013-06-29 23:47:46 +08:00
fullwall
f123b2f44e Remove /tc alias 2013-06-29 23:32:36 +08:00
fullwall
59996b44af Fix Sheared trait 2013-06-28 17:39:58 +08:00
fullwall
8d7d8a7261 Fix bug with /npc playerlist, add some mob-specific methods 2013-06-08 18:43:19 +08:00
fullwall
c9f51bca26 Add more waypoint manipulation flags 2013-06-01 16:37:14 +08:00
fullwall
34c61dcc07 Implement NPC#getStoredLocation 2013-06-01 16:11:55 +08:00
fullwall
a47e05728a Extract attack range to a setting 2013-05-18 13:19:33 +08:00
fullwall
005ed48216 Add setting for new boat controls for controllable NPCs. Fixes CITIZENS-556 2013-05-16 12:04:21 +08:00
fullwall
b0519f05b4 Allow /npc spawn to use the selected NPC 2013-05-15 12:08:54 +08:00
fullwall
96c8f0d86a Add debug for navigation, make sure that destination is in range before calling waypoint triggers 2013-05-15 11:58:09 +08:00
fullwall
9797d4cdeb Add some arguments to the /npc path command allowing for pausing and immediate waypoint placing 2013-05-15 11:45:56 +08:00
fullwall
0e4a85bc4a Fix /npc wolf collar parsing 2013-05-08 21:08:12 +08:00
fullwall
684d1e0ff0 Whoops. MC 1.5.2 should be working now 2013-05-03 12:35:31 +08:00
fullwall
77fa6f56d8 Update NMS.java 2013-05-03 12:30:39 +08:00
fullwall
9f953a81ed Update to MC 1.4.2 2013-05-03 12:25:24 +08:00
fullwall
7b1005a1a7 Fix /npc gamemode 2013-04-28 21:31:53 +08:00
fullwall
de74b5c848 Update AI for Giants 2013-04-22 11:25:58 +08:00
fullwall
d5c4ae337d NPC limit is now inclusive rather than exclusive 2013-04-18 22:40:11 +08:00
fullwall
cfeabdff0d Check for both types of NPCCreateEvent 2013-04-18 22:03:27 +08:00
fullwall
26fee2eccc Add citizens.npc.createall permission for PEX users 2013-04-17 11:41:51 +08:00
fullwall
cfefa87081 Changes to world unloading 2013-04-14 18:23:21 +08:00
fullwall
1a80036bd5 Fixed debug output 2013-04-14 14:55:09 +08:00
fullwall
623430451f Controllable NPCs now have correct yaw 2013-04-13 15:49:17 +08:00
fullwall
e75c167da3 Implement new type API 2013-04-12 23:56:18 +08:00
fullwall
c7d75687c4 Use XORShiftRNG directly 2013-04-12 20:12:03 +08:00
fullwall
a38516e27a Possible fix pt. 2 2013-04-12 18:31:45 +08:00
fullwall
44ce564609 Possible fix for Vec3D error 2013-04-12 17:57:15 +08:00
fullwall
569c4a4c51 Remove behaviours and /script command 2013-04-01 20:04:40 +08:00
fullwall
32f745a7d0 Implement new setTarget 2013-03-30 20:47:10 +08:00
fullwall
14b0387c04 Compile fix 2013-03-26 22:08:38 +08:00
fullwall
a3231176bf MC 1.5.1 2013-03-21 12:32:54 +08:00
fullwall
eb5006b74b MC 1.5.1 2013-03-21 12:27:29 +08:00
fullwall
578839b5da Fix bats 2013-03-18 18:52:45 +08:00
fullwall
f55d5e845a Merge branch 'master' of https://github.com/CitizensDev/Citizens2 2013-03-17 22:41:18 +08:00
fullwall
7a030885e8 BlockBreaker is now a Goal/Behavior 2013-03-17 22:40:37 +08:00
fullwall
11cc5d83d2 citizens.npc.* now grants citizens.npc.create.* 2013-03-17 14:12:59 +08:00
fullwall
94c16c4efc Allow non-players to have anchors and poses 2013-03-17 11:28:04 +08:00
fullwall
5a74a02f33 Head yaw method update 2013-03-16 16:13:35 +08:00
fullwall
41b4004a37 Rename /npc nameplate to /npc name (may change later) 2013-03-16 15:17:42 +08:00
fullwall
76b2bc3864 add /npc nameplate command 2013-03-16 15:06:04 +08:00
fullwall
482eb05766 Misc. fixes 2013-03-16 13:28:26 +08:00
fullwall
d8e7c79c89 Mob NPCs have names 2013-03-16 13:10:10 +08:00
fullwall
6a7744859b Misc. translation fixes 2013-03-16 12:43:33 +08:00
agentkid20@gmail.com
dba652bb96 Updated reflection. 2013-03-15 23:39:04 -04:00
agentkid20@gmail.com
630f97074c Attempt fix for bad CB version number. 2013-03-15 23:17:50 -04:00
agentkid20@gmail.com
2f734ce598 Update for Minecraft 1.5. Untested. 2013-03-15 23:05:45 -04:00
fullwall
131453f775 Fix CITIZENS-485 (require per-mob type permission in /npc create) 2013-03-15 18:39:18 +08:00
fullwall
aa022f8fae Cancel navigation on despawn: Navigation isn't carried over so CitizensNavigator would be left in an inconsistent state 2013-03-14 23:29:41 +08:00
fullwall
5f093276f1 Using /npc despawn now removes from the respawn list 2013-03-14 21:38:10 +08:00
fullwall
c10a41b395 Fix some pathing bugs 2013-03-14 21:03:33 +08:00
fullwall
8bf6917fd3 Set handle.ax for head yaw 2013-03-12 22:49:24 +08:00
fullwall
be24157951 Fix typo 2013-03-11 21:13:05 +08:00
fullwall
deba96875c Controllabe NPCs stop only on shift-left/right click now 2013-03-11 19:35:21 +08:00