Skip to content

Commit aa1dffd

Browse files
mercurialmusicmercurialmusic
authored
Merge pull request #19 from PrisonTeam/bleeding
Prison Cleanup: prison-spigot: Removed obsolete and unneeded comments…
2 parents c419920 + 10e9c79 commit aa1dffd

File tree

67 files changed

+2515
-5953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2515
-5953
lines changed

‎docs/changelog_v3.3.x.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
These change logs represent the work that has been going on within prison.
1515

1616

17-
# 3.3.0-alpha.19j 2026-03-07
17+
# 3.3.0-alpha.19j 2026-03-15
18+
19+
20+
* **Prison Cleanup: prison-spigot: Removed obsolete and unneeded comments and fix indentation where needed.** Second part.
21+
22+
23+
* **Prison Cleanup: prison-spigot: Removed obsolete and unneeded comments and fix indentation where needed.** First part.
1824

1925

2026
* **Bug fix in the ChatTest Junit test. When I was cleaning up that source I accidentally introduced a stray '.'.**

‎prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotCommandSender.java‎

Lines changed: 102 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public UUID getUniqueId() {
6767
}
6868

6969
public UUID getUUID() {
70-
UUID uuid = null;
71-
if ( isPlayer() ) {
72-
uuid = ((org.bukkit.entity.Player) bukkitSender).getUniqueId();
73-
}
70+
UUID uuid = null;
71+
if ( isPlayer() ) {
72+
uuid = ((org.bukkit.entity.Player) bukkitSender).getUniqueId();
73+
}
7474
return uuid;
7575
}
7676

@@ -89,10 +89,10 @@ public String getName() {
8989
@Override
9090
public void dispatchCommand(String command) {
9191

92-
command = CommandHandler.remapRootCmdIdentifiers( command );
93-
94-
String registeredCmd = Prison.get().getCommandHandler()
95-
.findRegisteredCommand( command );
92+
command = CommandHandler.remapRootCmdIdentifiers( command );
93+
94+
String registeredCmd = Prison.get().getCommandHandler()
95+
.findRegisteredCommand( command );
9696

9797
Bukkit.getServer().dispatchCommand(bukkitSender, registeredCmd);
9898
}
@@ -104,36 +104,36 @@ public boolean doesSupportColors() {
104104

105105
@Override
106106
public void sendMessage(String message) {
107-
108-
String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" );
109-
110-
for ( String msg : msgs ) {
111-
bukkitSender.sendMessage(msg);
107+
108+
String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" );
109+
110+
for ( String msg : msgs ) {
111+
bukkitSender.sendMessage(msg);
112112
}
113113
}
114114

115115
@Override
116116
public void sendMessage(String[] messages) {
117117
for (String message : messages) {
118118

119-
String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" );
120-
for ( String msg : msgs ) {
121-
122-
sendMessage(msg);
123-
}
119+
String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" );
120+
for ( String msg : msgs ) {
121+
122+
sendMessage(msg);
123+
}
124124
}
125125
}
126126

127127
@Override
128128
public void sendMessage(List<String> messages) {
129-
for (String message : messages) {
130-
131-
String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" );
132-
for ( String msg : msgs ) {
133-
134-
sendMessage(msg);
135-
}
136-
}
129+
for (String message : messages) {
130+
131+
String[] msgs = Text.translateAmpColorCodes(message).split( "\\{br\\}" );
132+
for ( String msg : msgs ) {
133+
134+
sendMessage(msg);
135+
}
136+
}
137137
}
138138

139139
@Override
@@ -146,7 +146,7 @@ public void sendRaw(String json) {
146146

147147
@Override
148148
public boolean isOp() {
149-
return bukkitSender.isOp();
149+
return bukkitSender.isOp();
150150
}
151151

152152
@Override
@@ -163,10 +163,10 @@ public boolean hasPermission(String perm) {
163163

164164
@Override
165165
public List<String> getPermissions() {
166-
List<String> results = new ArrayList<>();
167-
168-
Set<PermissionAttachmentInfo> perms = bukkitSender.getEffectivePermissions();
169-
for ( PermissionAttachmentInfo perm : perms )
166+
List<String> results = new ArrayList<>();
167+
168+
Set<PermissionAttachmentInfo> perms = bukkitSender.getEffectivePermissions();
169+
for ( PermissionAttachmentInfo perm : perms )
170170
{
171171
results.add( perm.getPermission() );
172172
}
@@ -178,128 +178,108 @@ public List<String> getPermissions() {
178178
@Override
179179
public List<String> getPermissions( String prefix ) {
180180

181-
return getPermissions( prefix, getPermissions() );
181+
return getPermissions( prefix, getPermissions() );
182182
}
183183

184184
@Override
185185
public List<String> getPermissions( String prefix, List<String> perms ) {
186-
List<String> results = new ArrayList<>();
187-
188-
for ( String perm : perms ) {
189-
if ( perm.startsWith( prefix ) ) {
190-
results.add( perm );
191-
}
192-
}
193-
194-
return results;
186+
List<String> results = new ArrayList<>();
187+
188+
for ( String perm : perms ) {
189+
if ( perm.startsWith( prefix ) ) {
190+
results.add( perm );
191+
}
192+
}
193+
194+
return results;
195195
}
196196

197-
// @Override
198-
// public List<String> getPermissions( String prefix ) {
199-
// List<String> results = new ArrayList<>();
200-
//
201-
// for ( String perm : getPermissions() ) {
202-
// if ( perm.startsWith( prefix ) ) {
203-
// results.add( perm );
204-
// }
205-
// }
206-
//
207-
// return results;
208-
// }
209197

210198

211199
@Override
212200
public double getSellAllMultiplier() {
213-
double results = 1.0;
214-
215-
if ( isPlayer() ) {
216-
217-
SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil();
218-
219-
if ( sellall != null && getWrapper() != null ) {
220-
results = sellall.getPlayerMultiplier((org.bukkit.entity.Player) getWrapper());
221-
}
222-
}
223-
224-
return results;
225-
226-
// Optional<Player> oPlayer = Prison.get().getPlatform().getPlayer( getName() );
227-
//
228-
// if ( oPlayer.isPresent() ) {
229-
// results = oPlayer.get().getSellAllMultiplier();
230-
// }
231-
//
232-
// return results;
201+
double results = 1.0;
202+
203+
if ( isPlayer() ) {
204+
205+
SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil();
206+
207+
if ( sellall != null && getWrapper() != null ) {
208+
results = sellall.getPlayerMultiplier((org.bukkit.entity.Player) getWrapper());
209+
}
210+
}
211+
212+
return results;
233213
}
234214

235215
@Override
236216
public double getSellAllMultiplierDebug() {
237-
double results = 1.0;
238-
239-
if ( isPlayer() ) {
240-
241-
SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil();
242-
243-
if ( sellall != null && getWrapper() != null ) {
244-
245-
Player player = getPlatformPlayer();
246-
247-
results = sellall.getPlayerMultiplierDebug( player );
248-
}
249-
}
250-
251-
return results;
217+
double results = 1.0;
218+
219+
if ( isPlayer() ) {
220+
221+
SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil();
222+
223+
if ( sellall != null && getWrapper() != null ) {
224+
225+
Player player = getPlatformPlayer();
226+
227+
results = sellall.getPlayerMultiplierDebug( player );
228+
}
229+
}
230+
231+
return results;
252232
}
253233

254234
@Override
255235
public List<String> getSellAllMultiplierListings() {
256-
List<String> results = new ArrayList<>();
257-
258-
if ( isPlayer() ) {
259-
260-
SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil();
261-
262-
if ( sellall != null && getWrapper() != null ) {
263-
results.addAll( sellall.getPlayerMultiplierList((org.bukkit.entity.Player) getWrapper()) );
264-
}
265-
}
266-
267-
268-
return results;
236+
List<String> results = new ArrayList<>();
237+
238+
if ( isPlayer() ) {
239+
240+
SellAllUtil sellall = SpigotPrison.getInstance().getSellAllUtil();
241+
242+
if ( sellall != null && getWrapper() != null ) {
243+
results.addAll( sellall.getPlayerMultiplierList((org.bukkit.entity.Player) getWrapper()) );
244+
}
245+
}
246+
247+
248+
return results;
269249
}
270250

271251
public List<String> getPermissionsIntegrations( boolean detailed ) {
272-
List<String> results = new ArrayList<>();
273-
274-
Optional<Player> oPlayer = Prison.get().getPlatform().getPlayer( getName() );
275-
276-
if ( oPlayer.isPresent() ) {
277-
278-
PermissionIntegration perms = PrisonAPI.getIntegrationManager() .getPermission();
279-
if ( perms != null ) {
280-
results = perms.getPermissions( oPlayer.get(), detailed );
281-
}
282-
}
283-
284-
return results;
252+
List<String> results = new ArrayList<>();
253+
254+
Optional<Player> oPlayer = Prison.get().getPlatform().getPlayer( getName() );
255+
256+
if ( oPlayer.isPresent() ) {
257+
258+
PermissionIntegration perms = PrisonAPI.getIntegrationManager() .getPermission();
259+
if ( perms != null ) {
260+
results = perms.getPermissions( oPlayer.get(), detailed );
261+
}
262+
}
263+
264+
return results;
285265
}
286266

287267

288268

289269
@Override
290270
public boolean isPlayer() {
291-
return bukkitSender != null && bukkitSender instanceof org.bukkit.entity.Player;
271+
return bukkitSender != null && bukkitSender instanceof org.bukkit.entity.Player;
292272
}
293273

294274
@Override
295275
public String toString() {
296-
StringBuilder sb = new StringBuilder();
297-
298-
sb.append( "SpigotCommandSender: " ).append( getName() )
299-
.append( " isOp=" ).append( isOp() )
300-
.append( " isPlayer=" ).append( isPlayer() );
301-
302-
return sb.toString();
276+
StringBuilder sb = new StringBuilder();
277+
278+
sb.append( "SpigotCommandSender: " ).append( getName() )
279+
.append( " isOp=" ).append( isOp() )
280+
.append( " isPlayer=" ).append( isPlayer() );
281+
282+
return sb.toString();
303283
}
304284

305285
public org.bukkit.command.CommandSender getWrapper() {

‎prison-spigot/src/main/java/tech/mcprison/prison/spigot/game/SpigotLocation.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public org.bukkit.Location getBukkitLocation() {
2929

3030
if ( bukkitLocation == null ) {
3131
bukkitLocation = getBukkitLocation( this );
32-
// bukkitLocation = createBukkitLocation();
3332
}
3433

3534
return bukkitLocation;
@@ -46,27 +45,9 @@ public static org.bukkit.Location getBukkitLocation( Location location ) {
4645

4746
bLocation.setPitch( location.getPitch() );
4847

49-
// bLocation.;
50-
5148
return bLocation;
5249
}
5350

54-
// private org.bukkit.Location createBukkitLocation() {
55-
//
56-
// org.bukkit.World world = Bukkit.getWorld( getWorld().getName() );
57-
//
58-
// org.bukkit.Location bLocation = new org.bukkit.Location(world, getBlockX(), getBlockY(), getBlockZ() );
59-
//
60-
// bLocation.setYaw(getYaw());
61-
//
62-
// bLocation.setPitch(getPitch());
63-
//
64-
// return bLocation;
65-
// }
66-
67-
// public void setBukkitLocation(org.bukkit.Location bukkitLocation) {
68-
// this.bukkitLocation = bukkitLocation;
69-
// }
7051

7152
public org.bukkit.World getBukkitWorld() {
7253
return getBukkitLocation().getWorld();

0 commit comments

Comments
 (0)