twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Only log for passenger / vehicle world mismatch

Browse Source 
Exception thrown may corrupt passenger/vehicle state
This commit is contained in:
Spottedleaf
2022-05-07 08:48:29 -07:00
parent 221d4c2d98
commit af019e9d32
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
patches/server/Ensure-entity-passenger-world-matches-ridden-entity.patch
View File

@@ -15,7 +15,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
protected boolean addPassenger(Entity entity) { // CraftBukkit protected boolean addPassenger(Entity entity) { // CraftBukkit
+ // Paper start + // Paper start
+ if (entity.level != this.level) { + if (entity.level != this.level) {
+ throw new IllegalArgumentException("Entity passenger world must match"); + LOGGER.error("Entity passenger world must match, cannot add " + entity + " as passenger to " + this, new Throwable());
+ return false;
+ } + }
+ // Paper end + // Paper end
if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572 if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572