Commit Graph

399 Commits

Author SHA1 Message Date
Jason M. Wood
b5d3e8700c Update the README for the server.properties options. 2013-12-08 11:38:17 -07:00
Jason M. Wood
ec18f31a0c Merge branch 'master' into server.properties
Conflicts:
	minecraft_server
2013-12-07 12:43:44 -07:00
Jason M. Wood
7c9730d6b7 Completion - Remove the screen option 2013-12-07 12:26:01 -07:00
Jason M. Wood
a8fb7497e6 Update the README to reflect the removal of GNU Screen from the requirements 2013-12-07 12:24:00 -07:00
Jason M. Wood
cd63f0528e Use a file handle rather than Screen to send commands to a world 2013-12-07 12:22:06 -07:00
Jason M. Wood
4fb8f5630a Get rid of unnecessary variables 2013-12-07 12:09:36 -07:00
Jason M. Wood
fffdc8882a Merge branch 'master' into server.properties
Conflicts:
	minecraft_server
2013-12-07 10:56:07 -07:00
Jason M. Wood
9545ae2785 Add a comment 2013-12-07 10:53:59 -07:00
Jason M. Wood
65934367b8 Completion - Use the new options to the list command 2013-12-07 09:44:13 -07:00
Jason M. Wood
66ed95bbf7 drop an unneeded variable 2013-12-06 07:08:28 -07:00
Jason M. Wood
167f7f00f8 Use printf to return process IDs 2013-12-04 21:20:24 -07:00
Jason M. Wood
3a5bf30601 Drop unnecessary variables and comments 2013-12-04 16:21:17 -07:00
Jason M. Wood
fedd204451 The Screen will close automatically when the Java process dies. 2013-12-04 16:16:15 -07:00
Jason M. Wood
c9d3d1544e Only depend on the Java process to be present for a running server 2013-12-04 16:13:11 -07:00
Jason M. Wood
85f0a0d9ee Use a different method of determining the PID of the Java process 2013-12-04 16:09:10 -07:00
Jason M. Wood
69dffa5267 Add a comment, and sleep for a second before doing further verification 2013-12-04 16:05:20 -07:00
Jason M. Wood
e051159ff1 Use the getJavaPID and getScreenPid methods instead of the getProcessIDs method 2013-12-04 15:58:16 -07:00
Jason M. Wood
b91bde3ecc Separate the functions for finding the Screen and Java PIDs 2013-12-04 15:45:53 -07:00
Jason M. Wood
afd84521fd Rename the query.dat and response.dat buffer files to query.in and query.out 2013-12-03 19:09:42 -07:00
Jason M. Wood
68b5d10213 Tack the version number onto the server.jar file 2013-12-03 19:06:44 -07:00
Jason M. Wood
b0a7731969 Add options to the list command 2013-12-03 14:55:54 -07:00
Jason M. Wood
8d9fb797ad Add the getDisabledWorlds method 2013-12-03 14:51:57 -07:00
Jason M. Wood
c128d76fca Renamge getWorlds to getEnabledWorlds 2013-12-03 14:49:45 -07:00
Jason M. Wood
a9d943b199 Merge pull request #35 from sandain/master
Merge Query changes from master
2013-12-03 11:26:13 -08:00
Jason M. Wood
a503da9227 Don't send a Query detailed information packet if the challenge packet failed 2013-12-03 12:23:42 -07:00
Jason M. Wood
ebbf91ec67 Fix the queryStart comments 2013-12-03 12:00:37 -07:00
Jason M. Wood
2ea83fe1b4 Merge pull request #34 from sandain/master
Merge Query changes in master
2013-12-03 10:49:41 -08:00
Jason M. Wood
4cc8295a88 Only attemt to send a Query packet if the buffer files exist 2013-12-03 11:43:31 -07:00
Jason M. Wood
4e510f27e0 Move the Query handler start to its own subroutine 2013-12-03 11:39:13 -07:00
Jason M. Wood
46b5ad2ac3 Don't send a query information packet if the challenge packet failed 2013-12-03 11:22:48 -07:00
Jason M. Wood
e4f771df7a Merge branch 'master' into server.properties 2013-12-02 22:33:00 -07:00
Jason M. Wood
22e8dd3ac3 Add a comment 2013-12-02 22:32:20 -07:00
Jason M. Wood
1a0db18f7d Fix comments for the updateServerSoftware function 2013-12-02 22:25:55 -07:00
Jason M. Wood
1be8bd147c Simplify the server software update function 2013-12-02 22:24:07 -07:00
Jason M. Wood
76416d7a8a Merge branch 'master' into server.properties
Conflicts:
	minecraft_server
2013-12-02 22:13:44 -07:00
Jason M. Wood
7fbbdaf199 Update the server software only when start or update is called. 2013-12-02 22:10:56 -07:00
Jason M. Wood
0b61e9e46f Port the check permission patch from master 2013-12-02 22:07:57 -07:00
Jason M. Wood
0fd382021a whitespace 2013-12-02 21:50:29 -07:00
Jason M. Wood
0957d4c18a whitespace 2013-12-02 21:49:55 -07:00
Jason M. Wood
a5d7451f85 Corect the usage statement for the update command. 2013-12-02 21:47:57 -07:00
Jason M. Wood
14f115ea2b Fix whitespace issue 2013-12-02 21:42:41 -07:00
Jason M. Wood
6620429295 Accept world arguments to the update option 2013-12-02 21:34:39 -07:00
Jason M. Wood
23263020b5 Accept world arguments to the update option 2013-12-02 21:30:26 -07:00
Jason M. Wood
e1f781eef2 Make sure the disabled world directory exists when disabling a world 2013-12-02 20:54:12 -07:00
Jason M. Wood
75ff670376 Completion - The create/new and enable options should not complete enabled worlds 2013-12-02 20:47:41 -07:00
Jason M. Wood
86b63b417a Add a Makefile 2013-12-02 20:39:12 -07:00
Jason M. Wood
d814f936e1 Completion - Grab the list of active worlds from the init.d script 2013-12-02 19:29:18 -07:00
Jason M. Wood
44e75a4301 Add a list command to get a list of active worlds 2013-12-02 19:27:52 -07:00
Jason M. Wood
67014bd1e0 Move the permission check to a subroutine 2013-12-02 19:26:56 -07:00
Jason M. Wood
f71b351393 Readme - Spell check, match wiki. 2013-12-02 14:24:07 -07:00