mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-08-25 07:15:35 +02:00
Compare commits
1 Commits
main
...
fix/v7/pla
Author | SHA1 | Date | |
---|---|---|---|
![]() |
6f36690bf2 |
2
.github/workflows/build-pr.yml
vendored
2
.github/workflows/build-pr.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
|||||||
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v4
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/actions/wrapper-validation@v4
|
uses: gradle/actions/wrapper-validation@v4
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v4
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/actions/wrapper-validation@v4
|
uses: gradle/actions/wrapper-validation@v4
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
|
2
.github/workflows/codeql.yml
vendored
2
.github/workflows/codeql.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
|||||||
language: [ 'java' ]
|
language: [ 'java' ]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v4
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
@@ -614,16 +614,16 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
|||||||
PlotId id = plot.getId();
|
PlotId id = plot.getId();
|
||||||
int x = id.getX();
|
int x = id.getX();
|
||||||
int z = id.getY();
|
int z = id.getY();
|
||||||
ByteBuffer buffer = ByteBuffer.allocate(13);
|
ByteBuffer buffer = ByteBuffer.allocate(14);
|
||||||
buffer.putShort((short) x);
|
buffer.putShort((short) x);
|
||||||
buffer.putShort((short) z);
|
buffer.putShort((short) z);
|
||||||
Location location = getLocation();
|
Location location = getLocation();
|
||||||
buffer.putInt(location.getX());
|
buffer.putInt(location.getX());
|
||||||
buffer.put((byte) location.getY());
|
buffer.putShort((short) location.getY());
|
||||||
buffer.putInt(location.getZ());
|
buffer.putInt(location.getZ());
|
||||||
setPersistentMeta("quitLoc", buffer.array());
|
setPersistentMeta("quitLocV2", buffer.array());
|
||||||
} else if (hasPersistentMeta("quitLoc")) {
|
} else if (hasPersistentMeta("quitLocV2")) {
|
||||||
removePersistentMeta("quitLoc");
|
removePersistentMeta("quitLocV2");
|
||||||
}
|
}
|
||||||
if (plot != null) {
|
if (plot != null) {
|
||||||
this.eventDispatcher.callLeave(this, plot);
|
this.eventDispatcher.callLeave(this, plot);
|
||||||
@@ -700,11 +700,18 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
PlotArea area = ((SinglePlotAreaManager) manager).getArea();
|
PlotArea area = ((SinglePlotAreaManager) manager).getArea();
|
||||||
|
boolean V2 = false;
|
||||||
byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
|
byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
|
||||||
if (arr == null) {
|
if (arr == null) {
|
||||||
return;
|
arr = PlotPlayer.this.getPersistentMeta("quitLocV2");
|
||||||
|
if (arr == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
V2 = true;
|
||||||
|
removePersistentMeta("quitLocV2");
|
||||||
|
} else {
|
||||||
|
removePersistentMeta("quitLoc");
|
||||||
}
|
}
|
||||||
removePersistentMeta("quitLoc");
|
|
||||||
|
|
||||||
if (!getMeta("teleportOnLogin", true)) {
|
if (!getMeta("teleportOnLogin", true)) {
|
||||||
return;
|
return;
|
||||||
@@ -714,7 +721,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
|||||||
final int plotZ = quitWorld.getShort();
|
final int plotZ = quitWorld.getShort();
|
||||||
PlotId id = PlotId.of(plotX, plotZ);
|
PlotId id = PlotId.of(plotX, plotZ);
|
||||||
int x = quitWorld.getInt();
|
int x = quitWorld.getInt();
|
||||||
int y = quitWorld.get() & 0xFF;
|
int y = V2 ? quitWorld.getShort() : (quitWorld.get() & 0xFF);
|
||||||
int z = quitWorld.getInt();
|
int z = quitWorld.getInt();
|
||||||
Plot plot = area.getOwnedPlot(id);
|
Plot plot = area.getOwnedPlot(id);
|
||||||
|
|
||||||
@@ -748,10 +755,11 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
e.printStackTrace();
|
LOGGER.error("Error populating persistent meta for player {}", PlotPlayer.this.getName(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user