Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 02:55:45 +01:00
Code Issues Projects Releases Wiki Activity
2,872 Commits 6 Branches 0 Tags 106 MiB
9cff1afb28
Commit Graph

246 Commits

Author SHA1 Message Date
fullwall
77aa63f1ff Trial minor optimisation 2022-01-22 21:08:55 +08:00
fullwall
7683516d62 Avoid setting NPC.COLLIDABLE_METADATA on Player NPCs 2022-01-20 17:10:52 +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
b933246a95 Implement a surprisingly missed optimisation 2021-12-29 00:30:53 +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
fullwall
71a6e43c0e Reduce eclipse compiler version 2021-12-01 23:13:32 +08:00
fullwall
bbae8d83d5 Trial updating eclipse compiler version 2021-12-01 23:09:38 +08:00
fullwall
22fe84831e Initial 1.18 update 2021-12-01 22:56:22 +08:00
fullwall
8f341ccaf2 Implement new metadata 2021-11-28 00:09:30 +08:00
fullwall
3da3cc2ae8 Fix /npc villager --profession error message, more sane boundingbox calculation 2021-11-27 12:19:19 +08:00
fullwall
840f32469b First pass at fall damage 2021-10-25 00:22:19 +08:00
fullwall
19c07ff1f5 Null check /npc bossbar 2021-10-14 18:05:19 +08:00
fullwall
fd3833deba Backport bukkitEntity change 2021-09-27 20:50:38 +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
f9bb877e85 Explicit types for 1.14 and 1.15 2021-09-20 21:16:40 +08:00
fullwall
db825cce72 Add rough impl of SneakTrait 2021-09-20 20:59:54 +08:00
fullwall
b930cb2460 Block invalid item material AIR 2021-08-31 02:06:31 +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
f2d4c38843 Preliminary update to 1.17 - known bugs include every entity glowing 2021-06-13 03:20:18 +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
c24ce1e1ed Use NMS methods for isSolid checking 2021-04-30 10:31:25 +08:00
fullwall
15f57c4970 Add null checks 2021-01-24 20:51:12 +08:00
fullwall
9cbc1c6bd8 Send equipment packets when equipment changes 2021-01-24 19:25:59 +08:00
fullwall
688ba3af8e Avoid errors with missing metadata 2021-01-20 17:55:34 +08:00
fullwall
0a6b1235db Reduce jar size by refactoring push event 2021-01-03 00:09:21 +08:00
fullwall
0111600aa8 Fix /npc polarbear message and simplify behavior map entities to work with /npc ai 2020-12-17 13:38:02 +08:00
fullwall
fe7f6e373f Add /npc polarbear -r and restore target and goal selectors 2020-12-17 13:13:23 +08:00
fullwall
556c58a7f6 Only jump with head height 
distance of above
 2020-12-16 01:16:04 +08:00
fullwall
7743763d3c Refactor common code, add missing condition 2020-11-14 18:41:21 +08:00
fullwall
dffbf60465 Simplify inBlock check to avoid chunk loading 2020-11-14 17:27:54 +08:00
fullwall
e52a3c4685 Extend CraftTippedArrow 2020-10-24 13:39:25 +08:00
fullwall
a944c3ca9c Make mob entity uuids the same as their NPC uuid 2020-10-18 18:32:33 +08:00
fullwall
9f7e57fbda Add spaces between /npc villager output 2020-10-03 22:13:47 +08:00
fullwall
8c1b51da98 Look more often even if target hasn't moved much 2020-09-16 21:58:15 +08:00
fullwall
0db8f37eeb Block right click water bucket for protected NPC fish 2020-09-16 20:35:34 +08:00
fullwall
7450c4db45 Use new getOrAddTrait methodf 2020-09-14 17:57:58 +08:00
fullwall
ab16b50814 Try to avoid handling player properties twice if respawning in the same tick 2020-09-13 16:16:54 +08:00
fullwall
934f94e137 Add setting for max minecraft pathfinder fall distance 2020-09-05 15:13:34 +08:00
fullwall
0c7dd3b4f0 Set default invulnerability ticks to 0 2020-09-01 23:51:17 +08:00
fullwall
c4e4d2f300 Add tablist remove delay setting 2020-08-28 22:55:07 +08:00
Alex "mcmonkey" Goodwin
a79e8a571a
Patch consistent application of scoreboard teams (#2302) 
* Patch consistent application of scoreboard teams

This corrects issues with scoreboard team logic by ensuring NPCs use a consistent internal name, rather than randomizing

* apply team name tag visible=false earlier
 2020-08-28 22:43:14 +08:00
fullwall
45907da2d7 Hologram bugfixes 2020-08-11 22:47:45 +08:00
fullwall
d9762be13b Use head height for block breaker 2020-08-08 23:08:08 +08:00
fullwall
b902879ca6 Fix gravity 2020-08-08 15:21:54 +08:00
fullwall
2a8f54f2d6 Move movement code into playerTick to avoid inter-world crashes 2020-07-27 17:14:57 +08:00
fullwall
0a4905c0f3 Randomise name if using holograms to have unique scoreboard names 2020-07-08 18:58:39 +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
9d2cad098a Implement new bounding box checker for pathfinding 2020-06-30 20:39:40 +08:00
fullwall
c9564c4be2 Implement enderman methods 2020-06-27 15:41:47 +08:00
fullwall
1505ccfeca Extra NPE check 2020-06-27 15:17:29 +08:00
fullwall
04519d868b Initial 1.16 commit 2020-06-25 17:24:32 +08:00
fullwall
c5bcfdc8cd Reformat 2020-06-12 20:02:48 +08:00
fullwall
b68782d661 Backport to 1.13/14 2020-06-12 19:57:45 +08:00
fullwall
df2c7689fe Fix 1.14 2020-05-20 16:29:43 +08:00
fullwall
3a27dd79bf Fix compile error 2020-05-16 20:25:02 +08:00
fullwall
e7368747c7 Rework packet sending to avoid replacing the entity tracker entry 2020-05-16 19:13:19 +08:00
fullwall
d484432f83 Call left click event for vehicles 2020-05-13 13:23:59 +08:00
fullwall
241810eedc Delay remove packet one tick 2020-05-12 23:50:54 +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
c1a89984a3 Rework mounted pathfinding 2020-05-12 20:28:41 +08:00
fullwall
a044eed988 Attempted fix for /npc tphere - make NPCs tracked over a longer range than previously 2020-05-12 19:43:52 +08:00
fullwall
c2467b7a25 Adjust horse pathfinding 2020-05-12 16:48:21 +08:00
fullwall
9d6a9f7a14 Just block right clicks for mushroom cows if protected 2020-05-10 13:38:02 +08:00
fullwall
10cea99af1 Disable milking protected NPC cows 2020-05-09 22:15:22 +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
e1f749236b Fix /npc mushroomcow, increase base player speed 2020-05-06 11:13:54 +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
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
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
a269bf1ccc Revert entity looking changes for now 2020-04-26 21:28:51 +08:00
fullwall
fe8eb4e85d Change how npc looking works 2020-04-25 16:57:31 +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
0531fe859e Implement new AI API for Minecraft 1.15.2, fix Squids 2020-04-20 17:38:56 +08:00
fullwall
80011eed41 Revamp SkinnableEntity into SkinTrait 2020-04-19 02:07:03 +08:00
fullwall
14ebf26935 Try to avoid water more 2020-04-08 23:59:49 +08:00
fullwall
275728e65b Fix cat lying down, remove dead code 2020-04-02 13:28:42 +08:00
fullwall
1cd8e1913e Add head yaw persistence 2020-03-21 18:30:52 +08:00
fullwall
1ddc78a543 Restore old stuck behaviour 2020-03-16 20:28:41 +08:00
fullwall
9f3841c3ec Fix /npc name in 1.8.8 2020-03-03 23:31:04 +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
bd95e7d364 Remove some dead code 2020-03-01 15:33:48 +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
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
Alex "mcmonkey" Goodwin
72c73329df Fix "SLEEP" and "STOP_SLEEPING" animations for 1.14 and 1.15 (#2029) 
These now both fully work as they used to, allowing an NPC (or any Player entity) to go into a sleeping animation without requiring a bed (which is a bug introduced in the one of the recent MC updates). Fully tested and working in 1.15, presumed working for 1.14 as most things work the same. Not ported to 1.13 as I'm less confident on whether things are equivalent that far back.
 2020-01-20 17:31:30 +09:00
fullwall
3e708f0d80 Fix typo 2019-12-21 18:58:33 +09:00
fullwall
ba216c7587 Fix issue #2000 2019-12-21 18:47:59 +09: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
6c4682b7a1 Fix issue #1974 2019-11-28 16:12:25 +08:00
fullwall
d0dcb235b3 Various fixes and features 2019-11-28 16:10:35 +08:00
fullwall
c6a86442d9 Attempted fix for #1972 2019-11-15 13:20:55 +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
890bc4ceab Check for behavior controller modification - fixes #1901 2019-09-17 19:24:38 +08:00
fullwall
0c3d998a72 Add impl to SLEEP 2019-08-08 14:10:51 +08:00
fullwall
2322cacb40 Clear goals on behavior change for villagers 2019-08-07 23:47:02 +08:00
fullwall
51984323dc Fix rename issue 2019-07-23 22:04:36 +08:00
fullwall
b1fc53f5e8 Update for 1.14.4 2019-07-21 20:58:53 +08:00
fullwall
f4ef934932 Fix scoreboards, villager level 2019-07-19 01:14:52 +08:00
fullwall
7a52682b87 Fix /npc villager --type 2019-07-13 21:42:57 +08:00
Alex 'mcmonkey' Goodwin
05471766b7
fix "/npc cat" flags 2019-07-11 18:45:13 -07:00
fullwall
4f4e7dd68d Attempt to fix pufferfish puffed 2019-07-11 23:26:05 +08:00
fullwall
530e175094 Fix /npc villager 2019-07-04 10:48:09 +08:00
fullwall
79ab0b4cba Extend fixes to other horse types 2019-07-02 01:28:40 +08:00
fullwall
7cb7b36507 Improve /npc controllable with horses 2019-07-02 01:22:15 +08:00
fullwall
2caadf5bad Stop fish from flopping 2019-07-01 17:16:06 +08:00
fullwall
b66fe9d18a Fix dolphins, pufferfish error and phantom looking 2019-07-01 16:47:36 +08:00
fullwall
74836f6cc3 Add /npc villager for 1.14 2019-07-01 16:14:16 +08:00
fullwall
1028a3fabb Fix /npc panda typo 2019-06-28 16:19:17 +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
2efdd3fcfe Merge branch 'master' of github.com:CitizensDev/Citizens2 2019-06-09 17:59:20 +08:00
fullwall
bb42a99bb2 Fix /npc panda 2019-06-09 17:59:05 +08:00
Alex "mcmonkey" Goodwin
3dad7670c7
fix for new spigot mappings update, fixes #1806 2019-06-02 08:36:47 -07:00
fullwall
489438b2f1 Bump pom, fix trader llamas 2019-05-28 18:03:45 +08:00
fullwall
65cbb8850f Support java 12 2019-05-16 17:50:59 +08:00
fullwall
d691416db1 Fix classcastexception 2019-05-14 22:13:30 +08:00
fullwall
c901bb0ebe Update for 1.14.1 2019-05-14 16:44:32 +08:00
fullwall
68e5fb2570 Fix javadoc pom and reformat other poms 2019-05-13 16:44:50 +08:00
fullwall
8ebfc31fce Missing import 2019-05-07 20:03:17 +08:00
fullwall
35fe1c5c93 Merge branch 'master' of github.com:CitizensDev/Citizens2 2019-05-07 20:02:33 +08:00
fullwall
483c25f11a Add new commands for new 1.14 API 2019-05-07 20:02:14 +08:00
mcmonkey
47fd18dc04
catch null bossbars for enderdragaon NPCs, fixes #1764 2019-05-03 01:55:47 -07:00
fullwall
244e8dd343 Fix villagers still having AI 2019-05-01 19:50:37 +08:00
fullwall
b7d43bf13b Remove debug 2019-04-27 21:25:09 +08:00
fullwall
61572db707 Trial fix for tablist flickering 2019-04-27 19:45:42 +08:00
fullwall
e4717d4bc7 Fix gravity, half-fix look close bug 2019-04-26 17:53:53 +08:00
mcmonkey
3d893d81d0
bump maven plugins, use ECJ for 1.14 compile 2019-04-25 17:57:54 -07:00
fullwall
dbef2882cd Make fishhook tickable - still not rendering 2019-04-25 16:51:54 +08:00
fullwall
c75218e966 Bugfixes 2019-04-25 16:42:07 +08:00
fullwall
0ec8ea68e8 Upgrade to MethodHandles 2019-04-25 15:43:44 +08:00
fullwall
ae96a02e49 Fix backwards compat issue with 1.13.2 2019-04-25 14:41:45 +08:00
fullwall
e6a3329ddc Update pom 2019-04-25 13:27:32 +08:00
fullwall
2d05ca134e Preliminary 1.14 update 2019-04-24 21:01:22 +08:00