Merged everything, should be stable

2019-07-02 12:55:24 -04:00
parent 201d86b913 bd37f68857
commit 1cc773c956
51 changed files with 5056 additions and 3502 deletions
--- a/src/main/java/com/wurmonline/server/questions/BookConversionQuestion.java
+++ b/src/main/java/com/wurmonline/server/questions/BookConversionQuestion.java
@@ -41,7 +41,7 @@ public class BookConversionQuestion extends Question {
                        Deity d = Deities.getDeity(deity);
                        p.setDeity(d);
                        p.setPriest(true);
-                        if(d.hateGod){
+                        if(d.isHateGod()){
                            p.setAlignment(-Math.abs(p.getAlignment()));
                        }else{
                            p.setAlignment(Math.abs(p.getAlignment()));