Grounditem partial fix

This commit is contained in:
dginovker
2019-06-19 15:26:36 -04:00
parent 477a3224de
commit 8d2f927bbb
45 changed files with 47 additions and 8 deletions
+2 -1
View File
@@ -18,7 +18,8 @@ public class ClientSettings {
/**
* The Servers Ip
*/
public final static String SERVER_IP = "35.226.247.68";
//public final static String SERVER_IP = "35.226.247.68";
public final static String SERVER_IP = "127.0.0.1";
/**
* The Npc Bits for the Server
*/
+4 -6
View File
@@ -4,8 +4,8 @@ character-password = pwjojo
[CHARACTER]
character-height = 0
character-posx = 3235
character-posy = 3219
character-posx = 3237
character-posy = 3217
character-rights = 0
hasStarter = false
bankPin1 = 0
@@ -37,7 +37,7 @@ village = false
lastThieve = 0
homeTele = 0
strongHold = false
character-energy = 50
character-energy = 55
crystal-bow-shots = 0
splitChat = false
canSpeak = true
@@ -70,7 +70,7 @@ membership = false
questPoints = 0
bananas = 0
magic-book = 0
special-amount = 1.5
special-amount = 2.5
musicOn = false
needsNewTask = false
luthas = false
@@ -177,10 +177,8 @@ character-item = 7 1266 1
character-item = 8 1206 1
character-item = 9 1278 1
character-item = 10 1172 1
character-item = 11 842 1
character-item = 12 883 25
character-item = 13 557 25
character-item = 14 559 15
character-item = 15 556 6
character-item = 16 558 4
character-item = 17 560 2
@@ -2,12 +2,19 @@ package redone.net;
import java.text.DecimalFormat;
import redone.game.items.GroundItem;
import redone.game.items.ItemAssistant;
import redone.game.players.Client;
import redone.game.players.Player;
import redone.game.players.PlayerHandler;
import redone.util.GameLogger;
import redone.util.Misc;
import redone.world.ItemHandler;
import redone.world.clip.Region;
import static redone.Server.itemHandler;
import static redone.world.ItemHandler.HIDE_TICKS;
public class ActionSender {
private final Client player;
@@ -580,6 +587,39 @@ public class ActionSender {
return this;
}
public void createGroundItem(Client player, int itemId, int itemX, int itemY, int itemAmount, int playerId) {
if (itemId > 0) {
if (itemId >= 2412 && itemId <= 2414) {
player.getActionSender().sendMessage("The cape vanishes as it touches the ground.");
return;
}
if (!redone.game.items.Item.itemStackable[itemId] && itemAmount > 0) {
for (int j = 0; j < itemAmount; j++) {
player.getActionSender().createGroundItem(itemId, itemX, itemY, 1);
GroundItem item = new GroundItem(itemId, itemX, itemY, player.getH(), 1, player.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName);
itemHandler.addItem(item);
String itemName = ItemAssistant.getItemName(itemId).toLowerCase();
if (!player.isDead && itemId != 526) {
if (player.getPlayerAssistant().isPlayer()) {
GameLogger.writeLog(player.playerName, "dropitem", player.playerName + " dropped " + itemAmount + " " + itemName + " absX: " + player.absX + " absY: " + player.absY + "");
}
}
}
} else {
player.getActionSender().createGroundItem(itemId, itemX, itemY, itemAmount);
GroundItem item = new GroundItem(itemId, itemX, itemY, player.getH(), itemAmount, player.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName);
itemHandler.addItem(item);
String itemName = ItemAssistant.getItemName(itemId).toLowerCase();
if (!player.isDead && itemId != 526) {
if (player.getPlayerAssistant().isPlayer()) {
GameLogger.writeLog(player.playerName, "dropitem", player.playerName + " dropped " + itemAmount + " " + itemName + " absX: " + player.absX + " absY: " + player.absY + "");
}
}
}
}
}
public ActionSender createGroundItem(int itemID, int itemX, int itemY, int itemAmount) {
player.getOutStream().createFrame(85);
player.getOutStream().writeByteC(itemY - 8 * player.mapRegionY);
+1 -1
View File
@@ -1 +1 @@
rm -rf org/ ; cp -r ../2006Redone_file_server/* . ; java -cp ".:./assets/*" org.apollo.jagcached.FileServer
rm -rf org/ ; cp -r ../out/production/2006Redone_file_server/* . ; java -cp ".:./assets/*" org.apollo.jagcached.FileServer
Binary file not shown.
Binary file not shown.
Binary file not shown.