mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-26 07:03:45 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			feature/ed
			...
			fix/v6/ent
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 4bc8b78224 | 
| @@ -866,10 +866,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | |||||||
|                                         com.plotsquared.core.location.Location pLoc = BukkitUtil.adapt(entity.getLocation()); |                                         com.plotsquared.core.location.Location pLoc = BukkitUtil.adapt(entity.getLocation()); | ||||||
|                                         PlotArea area = pLoc.getPlotArea(); |                                         PlotArea area = pLoc.getPlotArea(); | ||||||
|                                         if (area != null) { |                                         if (area != null) { | ||||||
|                                             PlotId currentPlotId = area.getPlotAbs(pLoc).getId(); |                                             Plot currentPlot = area.getPlotAbs(pLoc); | ||||||
|                                             if (!originalPlotId.equals(currentPlotId) && (currentPlotId == null || !area.getPlot( |                                             if (currentPlot == null || !originalPlotId.equals(currentPlot.getId())) { | ||||||
|                                                             originalPlotId) |  | ||||||
|                                                     .equals(area.getPlot(currentPlotId)))) { |  | ||||||
|                                                 if (entity.hasMetadata("ps-tmp-teleport")) { |                                                 if (entity.hasMetadata("ps-tmp-teleport")) { | ||||||
|                                                     continue; |                                                     continue; | ||||||
|                                                 } |                                                 } | ||||||
| @@ -883,11 +881,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | |||||||
|                                     com.plotsquared.core.location.Location pLoc = BukkitUtil.adapt(entity.getLocation()); |                                     com.plotsquared.core.location.Location pLoc = BukkitUtil.adapt(entity.getLocation()); | ||||||
|                                     PlotArea area = pLoc.getPlotArea(); |                                     PlotArea area = pLoc.getPlotArea(); | ||||||
|                                     if (area != null) { |                                     if (area != null) { | ||||||
|                                         PlotId currentPlotId = area.getPlotAbs(pLoc).getId(); |                                         Plot currentPlot = area.getPlotAbs(pLoc); | ||||||
|                                         if (currentPlotId != null) { |                                         if (currentPlot != null) { | ||||||
|                                             entity.setMetadata( |                                             entity.setMetadata( | ||||||
|                                                     "shulkerPlot", |                                                     "shulkerPlot", | ||||||
|                                                     new FixedMetadataValue((Plugin) PlotSquared.platform(), currentPlotId) |                                                     new FixedMetadataValue((Plugin) PlotSquared.platform(), currentPlot.getId()) | ||||||
|                                             ); |                                             ); | ||||||
|                                         } |                                         } | ||||||
|                                     } |                                     } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user