2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 00:32:06 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Global drops/monks/al kharid furnance (#192)

Browse Source 
closes #177
closes #136 (hp restoring works, couldn't find the anim tho)
closes #178 (should fix all the issues, let me know for sure)
Also removed the object does not exist message ingame for non admins and got rid of the isBotting code when clicking objects
This commit is contained in:
Mr Extremez
2019-11-17 17:30:08 -06:00
committed by Daniel Ginovker
parent 855f4b9ab7
commit 2b6ff7db02
23 changed files with 192 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/content/combat/npcs/NpcCombat.java
+8
View File
@@ -231,6 +231,14 @@ public class NpcCombat {
NpcHandler.npcs[i].projectileId, 43, 31,
-c.getId() - 1, 65);
}
int random = Misc.random(10);
if (NpcHandler.npcs[i].npcType == 222 && (NpcHandler.npcs[i].killerId > 0 && NpcHandler.npcs[i].underAttack) && !NpcHandler.npcs[i].isDead && (NpcHandler.npcs[i].HP < NpcHandler.npcs[i].MaxHP + 1)) {
if (random < 3) {
NpcHandler.npcs[i].HP += 2;
//NpcHandler.npcs[i].startAnimation(84);
NpcHandler.npcs[i].updateRequired = true;
}
}
c.underAttackBy2 = i;
c.singleCombatDelay2 = System.currentTimeMillis();
NpcHandler.npcs[i].oldIndex = c.playerId;
2006Redone Server/src/redone/game/objects/Objects.java
+3
View File
@@ -42,6 +42,9 @@ public class Objects {
ObjectDef def = ObjectDef.getObjectDef(objectId);
if (def == null)
return new int[] {1, 1};
if (objectId == 2781) {
return new int[] {3, 3};
}
int xLength;
int yLength;
if (objectFace != 1 && objectFace != 3) {
2006Redone Server/src/redone/game/objects/ObjectsActions.java
+8 -23
View File
@@ -62,8 +62,8 @@ public class ObjectsActions {
player.faceUpdate(0);
player.clickObjectType = 0;
player.turnPlayerTo(objectX, objectY);
if (!Region.objectExists(objectType, objectX, objectY, player.heightLevel)) {
player.getActionSender().sendMessage("This object does not exist. Please report this to a staff member.");
if (!Region.objectExists(objectType, objectX, objectY, player.heightLevel) && player.playerRights > 1) {
player.getActionSender().sendMessage("[DEBUG] This object does not exist.");
return;
}
if (Webs.webs(player, objectType)) {
@@ -2562,15 +2562,10 @@ public class ObjectsActions {
player.faceUpdate(0);
player.clickObjectType = 0;
player.turnPlayerTo(obX, obY);
if (!Region.objectExists(objectType, obX, obY, player.heightLevel)) {
player.getActionSender().sendMessage("This object does not exist. Please report this to a staff member.");
if (!Region.objectExists(objectType, obX, obY, player.heightLevel) && player.playerRights > 1) {
player.getActionSender().sendMessage("[DEBUG] This object does not exist.");
return;
}
if (player.isBotting == true) {
player.getActionSender().sendMessage("You can't click any objects until you confirm you are not botting.");
player.getActionSender().sendMessage("If you need to you can type ::amibotting, to see if your botting.");
return;
}
LogCutting.resetFletching(player);
switch (objectType) {
case 6:
@@ -2828,15 +2823,10 @@ public class ObjectsActions {
if (player.playerRights == 3) {
player.getActionSender().sendMessage("Object type: " + objectType);
}
if (!Region.objectExists(objectType, obX, obY, player.heightLevel)) {
player.getActionSender().sendMessage("This object does not exist. Please report this to a staff member.");
if (!Region.objectExists(objectType, obX, obY, player.heightLevel) && player.playerRights > 1) {
player.getActionSender().sendMessage("[DEBUG] This object does not exist.");
return;
}
if (player.isBotting == true) {
player.getActionSender().sendMessage("You can't click any objects until you confirm you are not botting.");
player.getActionSender().sendMessage("If you need to you can type ::amibotting, to see if your botting.");
return;
}
if (Stalls.isObject(objectType)) {
Stalls.attemptStall(player, objectType, obX, obY);
return;
@@ -2879,15 +2869,10 @@ public class ObjectsActions {
if (player.playerRights == 3) {
player.getActionSender().sendMessage("Object type: " + objectType);
}
if (!Region.objectExists(objectType, obX, obY, player.heightLevel)) {
player.getActionSender().sendMessage("This object does not exist. Please report this to a staff member.");
if (!Region.objectExists(objectType, obX, obY, player.heightLevel) && player.playerRights > 1) {
player.getActionSender().sendMessage("[DEBUG] This object does not exist.");
return;
}
if (player.isBotting == true) {
player.getActionSender().sendMessage("You can't click any objects until you confirm you are not botting.");
player.getActionSender().sendMessage("If you need to you can type ::amibotting, to see if your botting.");
return;
}
Farming.openGuide(player, player.objectId);
switch (objectType) {
2006Redone Server/src/redone/game/players/Player.java
+1 -1
View File
@@ -17,7 +17,7 @@ public abstract class Player {
public String currentTime, date, creationAddress = "", slayerMaster;
public boolean lostCannon = false;
public boolean lostCannon = false, refresh = false;
public ArrayList<String> killedPlayers = new ArrayList<String>();
public ArrayList<Integer> attackedPlayers = new ArrayList<Integer>();
2006Redone Server/src/redone/game/players/PlayerAssistant.java
+8
View File
@@ -776,6 +776,10 @@ public class PlayerAssistant {
player.npcIndex = 0;
player.playerIndex = 0;
player.faceUpdate(0);
player.refresh = false;
if(player.heightLevel != height) {
player.refresh = true;
}
player.teleHeight = height;
// client.resetShaking();
player.isTeleporting = true;
@@ -949,9 +953,13 @@ public class PlayerAssistant {
}
public void movePlayer(int x, int y, int h) {
player.refresh = false;
player.resetWalkingQueue();
player.teleportToX = x;
player.teleportToY = y;
if(player.heightLevel != h) {
player.refresh = true;
}
player.heightLevel = h;
player.getPlayerAssistant().requestUpdates();
}
2006Redone Server/src/redone/game/players/PlayerHandler.java
+6 -1
View File
@@ -1,7 +1,6 @@
package redone.game.players;
import java.net.InetSocketAddress;
import redone.Constants;
import redone.Server;
import redone.event.CycleEventHandler;
@@ -10,6 +9,7 @@ import redone.game.npcs.Npc;
import redone.game.npcs.NpcHandler;
import redone.util.Misc;
import redone.util.Stream;
import redone.world.GlobalDropsHandler;
public class PlayerHandler {
@@ -365,6 +365,11 @@ public class PlayerHandler {
}
str.endFrameVarSizeWord();
if (plr.refresh) {
GlobalDropsHandler.reset((Client)plr);
plr.refresh = false;
}
}
private void removePlayer(Player plr) {