Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename MaplePortal

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:36:45 +02:00
parent 667bc69eb1
commit 7f4760ba1a
19 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/channel/handlers/ChangeMapHandler.java
View File

@@ -29,7 +29,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleTrade;
import server.maps.MapleMap;
import server.maps.MaplePortal;
import server.maps.Portal;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -78,7 +78,7 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
p.readByte(); // 1 = from dying 0 = regular portals
int targetid = p.readInt();
String startwp = p.readString();
MaplePortal portal = chr.getMap().getPortal(startwp);
Portal portal = chr.getMap().getPortal(startwp);
p.readByte();
boolean wheel = p.readByte() > 0;

4
src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java
View File

@@ -26,7 +26,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleTrade;
import server.MapleTrade.TradeResult;
import server.maps.MaplePortal;
import server.maps.Portal;
import tools.PacketCreator;
public final class ChangeMapSpecialHandler extends AbstractPacketHandler {
@@ -35,7 +35,7 @@ public final class ChangeMapSpecialHandler extends AbstractPacketHandler {
p.readByte();
String startwp = p.readString();
p.readShort();
MaplePortal portal = c.getPlayer().getMap().getPortal(startwp);
Portal portal = c.getPlayer().getMap().getPortal(startwp);
if (portal == null || c.getPlayer().portalDelay() > currentServerTime() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) {
c.sendPacket(PacketCreator.enableActions());
return;

4
src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
View File

@@ -29,8 +29,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapObject;
import server.maps.MapObjectType;
import server.maps.MaplePortal;
import server.maps.PlayerShop;
import server.maps.Portal;
import tools.PacketCreator;
import java.awt.*;
@@ -63,7 +63,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {
}
Point cpos = chr.getPosition();
MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos);
Portal portal = chr.getMap().findClosestTeleportPortal(cpos);
if (portal != null && portal.getPosition().distance(cpos) < 120.0) {
chr.sendPacket(PacketCreator.getMiniRoomError(10));
return;

2
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -814,7 +814,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
}
Point cpos = chr.getPosition();
MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos);
Portal portal = chr.getMap().findClosestTeleportPortal(cpos);
if (portal != null && portal.getPosition().distance(cpos) < 120.0) {
chr.sendPacket(PacketCreator.getMiniRoomError(10));
return false;