Feature/add timeout and deco #602
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Random TP players to location away from other colonies
Added in a 4 try for the TP then requests player to try again if it does not find a good spot
Better use less global variables and distribute the variables to the methods and use the return values. We can't be sure if the sender is a player always. And if we instantiate that in the variables already probably causes the bug you had.
Y not reassigning
Seems to be working good
add the permission to the config file to allow/deny players to use of it
set up config file to handle the ability to allow players to use the command or not
Added the perms to the commands we discussed and added a configuration for the upper bounds for the TP command
Simplified code to check the config file to see with players can use commands
Still getting a couple errors when using commands
…mmand' Conflicts: src/main/java/com/minecolonies/coremod/commands/AbstractSingleCommand.java src/main/java/com/minecolonies/coremod/commands/ColonyTPCommand.java src/main/java/com/minecolonies/coremod/commands/DeleteColonyCommand.java src/main/java/com/minecolonies/coremod/commands/ShowColonyInfoCommand.java
Conflicts: src/main/java/com/minecolonies/coremod/commands/CitizenInfoCommand.java src/main/java/com/minecolonies/coremod/commands/ListCitizensCommand.java src/main/java/com/minecolonies/coremod/commands/ShowColonyInfoCommand.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/builder/EntityAIStructureBuilder.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/miner/EntityAIStructureMiner.java
* Fix upgrade button label for town hall * "Upgrade Building" button label fix * upgrade should be enabled * revert back to the previous translation string
Made suggested changes to CTP
Conflicts: src/main/java/com/minecolonies/coremod/colony/permissions/Permissions.java src/main/java/com/minecolonies/coremod/commands/AbstractSingleCommand.java src/main/java/com/minecolonies/coremod/commands/DeleteColonyCommand.java src/main/java/com/minecolonies/coremod/commands/RandomTeleportCommand.java src/main/java/com/minecolonies/coremod/commands/RefreshColonyCommand.java src/main/java/com/minecolonies/coremod/configuration/ConfigurationHandler.java src/main/java/com/minecolonies/coremod/configuration/Configurations.java src/main/resources/assets/minecolonies/gui/windowHutFisherman.xml
|
|
6D40
Raycoms
added a commit
that referenced
this pull request
Feb 16, 2017
* Colony TP Command Random TP players to location away from other colonies * ColoyTPCommand update Added in a 4 try for the TP then requests player to try again if it does not find a good spot * Fix problem with world not loading. Better use less global variables and distribute the variables to the methods and use the return values. We can't be sure if the sender is a player always. And if we instantiate that in the variables already probably causes the bug you had. * Colony TP Command Y not reassigning * Colony TP Command Seems to be working good * Colony TP Command add the permission to the config file to allow/deny players to use of it * Colony RTP Command set up config file to handle the ability to allow players to use the command or not * Added perms for 8 commands to configs Added the perms to the commands we discussed and added a configuration for the upper bounds for the TP command * Commands with Configs Simplified code to check the config file to see with players can use commands * Commands Clean up Still getting a couple errors when using commands * Commands Fix CitizenInfo pushing for safety as I fix the others * Commands All working still need testing in a Multiplayer environment. addOfficer still has issues. * clean up commands #1 * Commnads mainly just clean up * More commands clean up- * Clean up the colonyTPCommand * Fix up some minor issues. * improve save position check * fix javadoc * Commands All polished and spit shined... * Fix upgrade button label for town hall (#543) * Fix upgrade button label for town hall * "Upgrade Building" button label fix * upgrade should be enabled * revert back to the previous translation string * Recall shouldn't return anything without citizen. * Add refresh and change owner commands. * Fix compile error * /#386-Rtp-command: Made suggested changes to CTP * Commands added OP over ride of permissions to Change and restore Colony Owner * more fixes * Commands Finished moving some of the methods to utilis * Commands CTP Works again. A little cleanup * Improve commands. (fix rtp and add to colonyOwner) * fix up owner command even more * Fix command * Fix up owner command and permissions. * Hotfix/some bugs (#545) * Fix game crashing bug and let players attack mobs * Check if file exists * remove unused imports * change order of if * Coltons remark * merge the repair build buttons. * fix up merge problems. * more merge fixes * fix annotations. * Resolved problems marvin mentioned * Resolve sonar issues. * Add missing parameter * rename random teleport command * Fix bug with incorrect pickaxe delivery * fix up random teleport * didn't need that check * fix up last merge issues * fix up level 5 citizen hut * resolve merge problems. * remove unneccessary imports * Clean up imports * fixing failing build. * fix removal * don'T get item dropped. * fix ctape replaceable * remove and add on place/destroy * Fix recall message messup * Fix replaceable issues * fix addofficer permission, fix citizen info * fix resource doubling * Fix the citizen command * fix openInventory message bug * Add a "at least" time to the teleport command. * add some decorations * sonar fix
Raycoms
added a commit
that referenced
this pull request
Feb 21, 2017
* Improved the upload of build outputs to the Dropbox (#591) Signed-off-by: OrionOnline <oriondevelopment@outlook.com> * fixed placing (#597) * Hotfix/#600-nullpointer * Feature/add timeout and deco (#602) * Colony TP Command Random TP players to location away from other colonies * ColoyTPCommand update Added in a 4 try for the TP then requests player to try again if it does not find a good spot * Fix problem with world not loading. Better use less global variables and distribute the variables to the methods and use the return values. We can't be sure if the sender is a player always. And if we instantiate that in the variables already probably causes the bug you had. * Colony TP Command Y not reassigning * Colony TP Command Seems to be working good * Colony TP Command add the permission to the config file to allow/deny players to use of it * Colony RTP Command set up config file to handle the ability to allow players to use the command or not * Added perms for 8 commands to configs Added the perms to the commands we discussed and added a configuration for the upper bounds for the TP command * Commands with Configs Simplified code to check the config file to see with players can use commands * Commands Clean up Still getting a couple errors when using commands * Commands Fix CitizenInfo pushing for safety as I fix the others * Commands All working still need testing in a Multiplayer environment. addOfficer still has issues. * clean up commands #1 * Commnads mainly just clean up * More commands clean up- * Clean up the colonyTPCommand * Fix up some minor issues. * improve save position check * fix javadoc * Commands All polished and spit shined... * Fix upgrade button label for town hall (#543) * Fix upgrade button label for town hall * "Upgrade Building" button label fix * upgrade should be enabled * revert back to the previous translation string * Recall shouldn't return anything without citizen. * Add refresh and change owner commands. * Fix compile error * /#386-Rtp-command: Made suggested changes to CTP * Commands added OP over ride of permissions to Change and restore Colony Owner * more fixes * Commands Finished moving some of the methods to utilis * Commands CTP Works again. A little cleanup * Improve commands. (fix rtp and add to colonyOwner) * fix up owner command even more * Fix command * Fix up owner command and permissions. * Hotfix/some bugs (#545) * Fix game crashing bug and let players attack mobs * Check if file exists * remove unused imports * change order of if * Coltons remark * merge the repair build buttons. * fix up merge problems. * more merge fixes * fix annotations. * Resolved problems marvin mentioned * Resolve sonar issues. * Add missing parameter * rename random teleport command * Fix bug with incorrect pickaxe delivery * fix up random teleport * didn't need that check * fix up last merge issues * fix up level 5 citizen hut * resolve merge problems. * remove unneccessary imports * Clean up imports * fixing failing build. * fix removal * don'T get item dropped. * fix ctape replaceable * remove and add on place/destroy * Fix recall message messup * Fix replaceable issues * fix addofficer permission, fix citizen info * fix resource doubling * Fix the citizen command * fix openInventory message bug * Add a "at least" time to the teleport command. * add some decorations * sonar fix * Fix merge conflicts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a way to calculate timeouts for certain commands (rtp here).
Adds some new decorations.
Review please