Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 04:35:50 +01:00
Code Issues Projects Releases Wiki Activity
1,684 Commits 6 Branches 0 Tags 106 MiB
dd9fb15792
Commit Graph

1684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a8ec654753 Be more aggressive in blocking achievement earning 2018-04-02 00:46:45 +08:00
fullwall
fc1d7eab58 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-03-30 21:18:56 +08:00
fullwall
3090bf3fde Use Collections.emptyMap() instead of empty ImmutableMap 2018-03-30 21:18:36 +08:00
fullwall
104847c472
Update README.md 2018-03-30 20:00:36 +08:00
fullwall
70e3a0b7ea
Update README.md 2018-03-30 20:00:08 +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
fullwall
e0f492f967
Merge pull request #1457 from mcmonkey4eva/master 
( Patch for #1453 ) proper wolf command output
 2018-03-24 15:43:59 +08:00
fullwall
6c9ba07737 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-03-24 15:34:02 +08:00
fullwall
9a5c6a2170 Fix #1452 2018-03-24 15:33:41 +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
Alex "mcmonkey" Goodwin
b44a61a92f
Merge pull request #1456 from mcmonkey4eva/master 
( Patch for #1455 ) reload saves rather than reconstructing
 2018-03-23 03:25:42 -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
e20e45169a Prevent magma cubes from damaging players 2018-03-15 17:21:51 +08:00
fullwall
a1d1a6cc13 Fix vex NPCs having gravity on spawn 2018-03-15 17:10:23 +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
8054667482 Implement a less CPU-intensive method of clearing advancement progress 2018-03-09 22:24:24 +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
e3f339b80d
Update ISSUE_TEMPLATE 2018-03-09 20:44:44 +08:00
fullwall
fc9f813f18 Modernise LookClose a little 2018-03-09 20:07:08 +08:00
fullwall
407430daa5 Stop default AI for players mounted on pigs 2018-03-09 19:44:10 +08:00
fullwall
30ef5de8e0 Fix vehicle enter prevention not working properly 2018-03-09 19:29:59 +08:00
fullwall
1f540d2ad2 Merge branch 'master' of github.com:CitizensDev/Citizens2 2018-03-09 18:37:01 +08:00
fullwall
a8fe35a19d Implement SwimmingExaminer 2018-03-09 18:36:43 +08:00
fullwall
c49dbb9989
Update ISSUE_TEMPLATE 2018-03-09 17:40:15 +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
bf13181bd1 Add a NPE check to getVehicle 2018-03-02 00:39:05 +08:00