diff --git a/2006Redone Client/run.bat b/2006Redone Client/run.bat deleted file mode 100644 index bffae8e3..00000000 --- a/2006Redone Client/run.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -title 2006Redone -cd bin -java Main -pause \ No newline at end of file diff --git a/2006Redone Server/redone/Server$1.class b/2006Redone Server/redone/Server$1.class index f2344016..fd435421 100644 Binary files a/2006Redone Server/redone/Server$1.class and b/2006Redone Server/redone/Server$1.class differ diff --git a/2006Redone Server/redone/Server.class b/2006Redone Server/redone/Server.class index 792fe6e0..b79cfb71 100644 Binary files a/2006Redone Server/redone/Server.class and b/2006Redone Server/redone/Server.class differ diff --git a/2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class b/2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class index 3a3f171c..a969b189 100644 Binary files a/2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class and b/2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class differ diff --git a/2006Redone Server/redone/game/content/quests/QuestAssistant.class b/2006Redone Server/redone/game/content/quests/QuestAssistant.class index 4587474d..fd93e7c1 100644 Binary files a/2006Redone Server/redone/game/content/quests/QuestAssistant.class and b/2006Redone Server/redone/game/content/quests/QuestAssistant.class differ diff --git a/2006Redone Server/redone/game/players/PlayerAssistant$1$1.class b/2006Redone Server/redone/game/players/PlayerAssistant$1$1.class index 5e433d0d..efaf8cd0 100644 Binary files a/2006Redone Server/redone/game/players/PlayerAssistant$1$1.class and b/2006Redone Server/redone/game/players/PlayerAssistant$1$1.class differ diff --git a/2006Redone Server/redone/game/players/PlayerAssistant$1.class b/2006Redone Server/redone/game/players/PlayerAssistant$1.class index 751eac7a..8bfa2767 100644 Binary files a/2006Redone Server/redone/game/players/PlayerAssistant$1.class and b/2006Redone Server/redone/game/players/PlayerAssistant$1.class differ diff --git a/2006Redone Server/redone/game/players/PlayerAssistant$2.class b/2006Redone Server/redone/game/players/PlayerAssistant$2.class index 1bc6cabd..c4f1eb1e 100644 Binary files a/2006Redone Server/redone/game/players/PlayerAssistant$2.class and b/2006Redone Server/redone/game/players/PlayerAssistant$2.class differ diff --git a/2006Redone Server/redone/game/players/PlayerAssistant.class b/2006Redone Server/redone/game/players/PlayerAssistant.class index 74fe3e3c..2e8f9583 100644 Binary files a/2006Redone Server/redone/game/players/PlayerAssistant.class and b/2006Redone Server/redone/game/players/PlayerAssistant.class differ diff --git a/2006Redone Server/redone/game/shops/ShopAssistant.class b/2006Redone Server/redone/game/shops/ShopAssistant.class index 84feeb03..93ede5c4 100644 Binary files a/2006Redone Server/redone/game/shops/ShopAssistant.class and b/2006Redone Server/redone/game/shops/ShopAssistant.class differ diff --git a/2006Redone Server/redone/integrations/discord/DiscordActivity.class b/2006Redone Server/redone/integrations/discord/DiscordActivity.class new file mode 100644 index 00000000..fc0f7474 Binary files /dev/null and b/2006Redone Server/redone/integrations/discord/DiscordActivity.class differ diff --git a/2006Redone Server/redone/integrations/discord/JavaCord.class b/2006Redone Server/redone/integrations/discord/JavaCord.class index 1dffdbcc..cb6a4e2d 100644 Binary files a/2006Redone Server/redone/integrations/discord/JavaCord.class and b/2006Redone Server/redone/integrations/discord/JavaCord.class differ diff --git a/2006Redone Server/redone/integrations/discord/commands/Commands.class b/2006Redone Server/redone/integrations/discord/commands/Commands.class index 5b2a1e12..06422a1c 100644 Binary files a/2006Redone Server/redone/integrations/discord/commands/Commands.class and b/2006Redone Server/redone/integrations/discord/commands/Commands.class differ diff --git a/2006Redone Server/redone/integrations/discord/commands/HeatMap.class b/2006Redone Server/redone/integrations/discord/commands/HeatMap.class new file mode 100644 index 00000000..edcb53e4 Binary files /dev/null and b/2006Redone Server/redone/integrations/discord/commands/HeatMap.class differ diff --git a/2006Redone Server/redone/integrations/discord/commands/Issues.class b/2006Redone Server/redone/integrations/discord/commands/Issues.class new file mode 100644 index 00000000..73efab2a Binary files /dev/null and b/2006Redone Server/redone/integrations/discord/commands/Issues.class differ diff --git a/2006Redone Server/redone/net/packets/impl/Bank10.class b/2006Redone Server/redone/net/packets/impl/Bank10.class index a7266730..ceefc102 100644 Binary files a/2006Redone Server/redone/net/packets/impl/Bank10.class and b/2006Redone Server/redone/net/packets/impl/Bank10.class differ diff --git a/2006Redone Server/redone/net/packets/impl/BankAll.class b/2006Redone Server/redone/net/packets/impl/BankAll.class index 24cf72ef..614676c3 100644 Binary files a/2006Redone Server/redone/net/packets/impl/BankAll.class and b/2006Redone Server/redone/net/packets/impl/BankAll.class differ diff --git a/2006Redone Server/redone/net/packets/impl/Commands.class b/2006Redone Server/redone/net/packets/impl/Commands.class index cf1bf42e..8c36bb62 100644 Binary files a/2006Redone Server/redone/net/packets/impl/Commands.class and b/2006Redone Server/redone/net/packets/impl/Commands.class differ diff --git a/2006Redone Server/runServer.sh b/2006Redone Server/runServer.sh index 005251b7..f9251e9c 100755 --- a/2006Redone Server/runServer.sh +++ b/2006Redone Server/runServer.sh @@ -1,3 +1,5 @@ +echo NOTE: This program is meant to be run by the live server admin only! +echo You probably don\'t want to run this, even if you\'re developing locally! rm -rf redone/ cp -r ../CompiledServer/production/2006rebotted/redone . -java -cp ".:./libs/*" redone.Server +java -Xmx15G -cp ".:./libs/*" redone.Server diff --git a/2006Redone file_server/runFileServer.sh b/2006Redone file_server/runFileServer.sh index c268c7cf..9079a44f 100755 --- a/2006Redone file_server/runFileServer.sh +++ b/2006Redone file_server/runFileServer.sh @@ -1,3 +1,4 @@ +echo This is meant to be run by the live server admin! You probably don\'t want to do this! rm -rf org/ cp -r ../CompiledServer/production/2006rebotted/org . java -cp ".:./libs/*" org.apollo.jagcached.FileServer diff --git a/CompiledServer/production/2006rebotted/redone/Server$1.class b/CompiledServer/production/2006rebotted/redone/Server$1.class index f2344016..fd435421 100644 Binary files a/CompiledServer/production/2006rebotted/redone/Server$1.class and b/CompiledServer/production/2006rebotted/redone/Server$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/Server.class b/CompiledServer/production/2006rebotted/redone/Server.class index 792fe6e0..b79cfb71 100644 Binary files a/CompiledServer/production/2006rebotted/redone/Server.class and b/CompiledServer/production/2006rebotted/redone/Server.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class index 13e1b8ff..efaf8cd0 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class index 993e8853..8bfa2767 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$1.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class index fb9cf813..c4f1eb1e 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant$2.class differ diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class index be572e38..2e8f9583 100644 Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class b/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class new file mode 100644 index 00000000..fc0f7474 Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/integrations/discord/DiscordActivity.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/discord/JavaCord.class b/CompiledServer/production/2006rebotted/redone/integrations/discord/JavaCord.class index 1dffdbcc..cb6a4e2d 100644 Binary files a/CompiledServer/production/2006rebotted/redone/integrations/discord/JavaCord.class and b/CompiledServer/production/2006rebotted/redone/integrations/discord/JavaCord.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Commands.class b/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Commands.class index 490e8eac..06422a1c 100644 Binary files a/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Commands.class and b/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Commands.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/HeatMap.class b/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/HeatMap.class new file mode 100644 index 00000000..edcb53e4 Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/HeatMap.class differ diff --git a/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Issues.class b/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Issues.class new file mode 100644 index 00000000..73efab2a Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/integrations/discord/commands/Issues.class differ