2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from Major-/377

Browse Source 
Fix #218
This commit is contained in:
Major
2016-02-15 19:22:00 +00:00
parent 710c8c70d0 d3c5417403
commit 27448bcdde
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/plugins/skill/herblore/ingredient.rb
+1 -1
View File
@@ -248,4 +248,4 @@ MAGIC_ROOTS = Ingredient.new(6051)
UNICORN_HORN_DUST = append_ground(235, 237)
DRAGON_SCALE_DUST = append_ground(241, 243)
CHOCOLATE_DUST = append_ground(1975, 1973)
# CRUSHED_NEST = append_ground(6693, 5075) # TODO: only in 377
CRUSHED_NEST = append_ground(6693, 5075)
data/plugins/skill/magic/convert.rb
+5 -4
View File
@@ -44,7 +44,7 @@ class ConvertingAction < SpellAction
reward = @spell.reward
@slots.each { |slot| inventory.set(slot, reward) }
unless firing # If we waited with firing events, restore it now and force a refresh
unless firing
inventory.start_firing_events
inventory.force_refresh
end
@@ -80,9 +80,10 @@ def bone_slots(player)
slots
end
def convert(button, level, elements, experience, reward)
def convert(_name, button, level, elements, experience, reward)
CONVERT_SPELLS[button] = ConvertSpell.new(level, elements, experience, reward)
end
convert 1159, 15, { NATURE => 1, WATER => 2, EARTH => 2 }, 25, 1963 # Bones to bananas
# convert 15877, 60, { NATURE => 2, WATER => 4, EARTH => 4 }, 35.5, 6883 # Bones to peaches
convert :bones_to_bananas, 1159, 15, { NATURE => 1, WATER => 2, EARTH => 2 }, 25, 1963
convert :bones_to_peaches, 15877, 60, { NATURE => 2, WATER => 4, EARTH => 4 }, 35.5, 6883
game/src/main/org/apollo/Server.java
+2 -2
View File
@@ -20,7 +20,7 @@ import org.apollo.cache.IndexedFileSystem;
import org.apollo.game.model.World;
import org.apollo.game.plugin.PluginContext;
import org.apollo.game.plugin.PluginManager;
import org.apollo.game.release.r317.Release317;
import org.apollo.game.release.r377.Release377;
import org.apollo.game.session.ApolloHandler;
import org.apollo.net.HttpChannelInitializer;
import org.apollo.net.JagGrabChannelInitializer;
@@ -50,7 +50,7 @@ public final class Server {
try {
Server server = new Server();
server.init(args.length == 1 ? args[0] : Release317.class.getName());
server.init(args.length == 1 ? args[0] : Release377.class.getName());
SocketAddress service = new InetSocketAddress(NetworkConstants.SERVICE_PORT);
SocketAddress http = new InetSocketAddress(NetworkConstants.HTTP_PORT);