mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-03 00:31:51 +00:00
Cleanup part 1 (#213)
* Clean up part 1 - Removed lots of dead code - Removed unncessary files not in use - Cleaned up small bits of code - Removed a few warnings - Server.java ---> GameEngine.java - Constants.java ---> GameConstants.java * Cape Dye Rewrote cape dying * Packaging - redone ----> com.rebotted * PacketSender/clean up - ActionSender ---> PacketSender - Moved many more packets to packetsender - Cleaned up more dead code * Merge Client/Player - Merged Client.java with Player.java (both were doing same thing so redundant to have both) - Removed some more dead code - Tidy a few small things up * Quests/more clean up - Removed more dead code - Made quests static in order to clean them up a bit * More cleanup - Removed some more of the dead quest code - Correcting naming of some of the shop variables
This commit is contained in:
committed by
Daniel Ginovker
parent
3d1ae1b288
commit
d876a923b9
@@ -0,0 +1,54 @@
|
||||
package com.rebotted.net.packets.impl;
|
||||
|
||||
import com.rebotted.game.players.Player;
|
||||
import com.rebotted.game.players.PlayerHandler;
|
||||
import com.rebotted.net.packets.PacketType;
|
||||
import com.rebotted.util.Misc;
|
||||
|
||||
/**
|
||||
* Clicking stuff (interfaces)
|
||||
**/
|
||||
public class ClickingStuff implements PacketType {
|
||||
|
||||
@Override
|
||||
public void processPacket(Player player, int packetType, int packetSize) {
|
||||
if (player.playerIsBusy()) {
|
||||
player.playerIsBusy = false;
|
||||
}
|
||||
if (player.isBanking)
|
||||
player.isBanking = false;
|
||||
if(player.isShopping)
|
||||
player.isShopping = false;
|
||||
if (player.inTrade) {
|
||||
Player opponent = (Player) PlayerHandler.players[player.tradeWith];
|
||||
if (!player.acceptedTrade || !opponent.inTrade || opponent == null) {
|
||||
opponent = (Player) PlayerHandler.players[player.tradeWith];
|
||||
opponent.tradeAccepted = false;
|
||||
player.tradeAccepted = false;
|
||||
opponent.tradeStatus = 0;
|
||||
player.tradeStatus = 0;
|
||||
player.tradeConfirmed = false;
|
||||
player.tradeConfirmed2 = false;
|
||||
player.getPacketSender().sendMessage("@red@Trade has been declined.");
|
||||
opponent.getPacketSender().sendMessage("@red@Other player has declined the trade.");
|
||||
Misc.println("trade reset");
|
||||
player.getTrading().declineTrade();
|
||||
opponent.getTrading().declineTrade();
|
||||
}
|
||||
}
|
||||
|
||||
if(player.openDuel && player.duelStatus >= 1 && player.duelStatus <= 4) {
|
||||
Player o = (Player) PlayerHandler.players[player.duelingWith];
|
||||
if (o != null)
|
||||
if (player.duelStatus >= 1 && player.duelStatus <= 4)
|
||||
player.getDueling().declineDuel();
|
||||
o.getDueling().declineDuel();
|
||||
}
|
||||
|
||||
if (player.duelStatus == 6) {
|
||||
player.getDueling().claimStakedItems();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user